From 684efc54fa35446a6b67a323a7df3d917cab52e3 Mon Sep 17 00:00:00 2001 From: InsanityDev Date: Tue, 12 Apr 2022 02:37:39 +0200 Subject: [PATCH] Rebrand, Remove Trap and Dirt Chests, Remove Cat AI, Update language files, Update model files, Update to the latest forge 1.18 version --- build.gradle | 16 +-- gradle.properties | 9 +- settings.gradle | 2 +- .../client/model/IronChestsModels.java | 80 ----------- .../common/ai/CatsSitOnChestsHandler.java | 33 ----- .../common/ai/IronChestCatSitOnBlockGoal.java | 33 ----- .../common/block/IronChestsBlocks.java | 113 ---------------- .../common/block/IronChestsTypes.java | 126 ------------------ .../entity/IronChestsBlockEntityTypes.java | 71 ---------- .../common/block/entity/package-info.java | 7 - .../ironchest/common/block/package-info.java | 7 - .../common/block/regular/DirtChestBlock.java | 23 ---- .../regular/entity/DirtChestBlockEntity.java | 73 ---------- .../block/regular/entity/package-info.java | 7 - .../common/block/regular/package-info.java | 7 - .../AbstractTrappedIronChestBlock.java | 44 ------ .../trapped/TrappedCopperChestBlock.java | 23 ---- .../trapped/TrappedCrystalChestBlock.java | 33 ----- .../trapped/TrappedDiamondChestBlock.java | 23 ---- .../block/trapped/TrappedDirtChestBlock.java | 23 ---- .../block/trapped/TrappedGoldChestBlock.java | 23 ---- .../block/trapped/TrappedIronChestBlock.java | 25 ---- .../trapped/TrappedObsidianChestBlock.java | 23 ---- .../AbstractTrappedIronChestBlockEntity.java | 30 ----- .../entity/TrappedCopperChestBlockEntity.java | 22 --- .../TrappedCrystalChestBlockEntity.java | 92 ------------- .../TrappedDiamondChestBlockEntity.java | 23 ---- .../entity/TrappedDirtChestBlockEntity.java | 74 ---------- .../entity/TrappedGoldChestBlockEntity.java | 23 ---- .../entity/TrappedIronChestBlockEntity.java | 22 --- .../TrappedObsidianChestBlockEntity.java | 23 ---- .../block/trapped/entity/package-info.java | 7 - .../common/block/trapped/package-info.java | 7 - .../ironchest/common/data/package-info.java | 7 - .../common/inventory/DirtChestSlot.java | 19 --- .../common/inventory/package-info.java | 7 - .../common/item/IronChestBlockItem.java | 85 ------------ .../common/item/IronChestsUpgradeType.java | 37 ----- .../ironchest/common/item/package-info.java | 7 - .../common/network/helper/package-info.java | 7 - .../common/network/package-info.java | 7 - .../ubujira/ironbarrels}/IronChests.java | 32 ++--- .../ironbarrels}/IronChestsClientEvents.java | 4 +- .../client/model/IronChestsModels.java | 48 +++++++ .../inventory/IronChestItemStackRenderer.java | 4 +- .../client/model/inventory/ModelItem.java | 2 +- .../client/model/inventory/package-info.java | 7 + .../client/model}/package-info.java | 2 +- .../ironbarrels/client}/package-info.java | 2 +- .../client/render/IronChestRenderer.java | 63 ++++----- .../client/render/package-info.java | 7 + .../client/screen/IronChestScreen.java | 12 +- .../client/screen/package-info.java | 7 + .../ubujira/ironbarrels}/common/Util.java | 2 +- .../common/block/IronChestsBlocks.java | 72 ++++++++++ .../common/block/IronChestsTypes.java | 102 ++++++++++++++ .../common/block/entity/ICrystalChest.java | 8 +- .../entity/IronChestsBlockEntityTypes.java | 38 ++++++ .../common/block/entity/package-info.java | 7 + .../common/block}/package-info.java | 2 +- .../block/regular/AbstractIronChestBlock.java | 16 +-- .../block/regular/CopperChestBlock.java | 8 +- .../block/regular/CrystalChestBlock.java | 10 +- .../block/regular/DiamondChestBlock.java | 8 +- .../common/block/regular/GoldChestBlock.java | 8 +- .../common/block/regular/IronChestBlock.java | 8 +- .../block/regular/ObsidianChestBlock.java | 8 +- .../entity/AbstractIronChestBlockEntity.java | 16 +-- .../entity/CopperChestBlockEntity.java | 10 +- .../entity/CrystalChestBlockEntity.java | 12 +- .../entity/DiamondChestBlockEntity.java | 10 +- .../regular/entity/GoldChestBlockEntity.java | 10 +- .../regular/entity/IronChestBlockEntity.java | 10 +- .../entity/ObsidianChestBlockEntity.java | 10 +- .../block/regular/entity/package-info.java | 7 + .../common/block/regular/package-info.java | 7 + .../common/data/IronChestsRecipeProvider.java | 79 ++--------- .../common/data}/package-info.java | 2 +- .../common/inventory/IronChestMenu.java | 22 +-- .../inventory/IronChestsContainerTypes.java | 7 +- .../common/inventory/package-info.java | 7 + .../common/item/ChestUpgradeItem.java | 52 +++----- .../common/item/IronChestBlockItem.java | 60 +++++++++ .../common/item/IronChestsItems.java | 6 +- .../common/item/IronChestsUpgradeType.java | 37 +++++ .../common/item}/package-info.java | 2 +- .../network/InventoryTopStacksSyncPacket.java | 16 +-- .../common/network/IronChestNetwork.java | 22 +-- .../common/network/helper/ISimplePacket.java | 2 +- .../network/helper/IThreadsafePacket.java | 2 +- .../common/network/helper}/package-info.java | 2 +- .../common/network/package-info.java | 7 + .../ironbarrels/common}/package-info.java | 2 +- .../ubujira/ironbarrels}/package-info.java | 2 +- src/main/resources/META-INF/mods.toml | 28 ++-- .../ironbarrels/blockstates/copper_chest.json | 7 + .../blockstates/crystal_chest.json | 7 + .../blockstates/diamond_chest.json | 7 + .../ironbarrels/blockstates/gold_chest.json | 7 + .../ironbarrels/blockstates/iron_chest.json | 7 + .../blockstates/obsidian_chest.json | 7 + .../assets/ironbarrels/lang/de_de.json | 27 ++++ .../assets/ironbarrels/lang/en_ud.json | 30 +++++ .../assets/ironbarrels/lang/en_us.json | 29 ++++ .../assets/ironbarrels/lang/es_ar.json | 30 +++++ .../assets/ironbarrels/lang/es_es.json | 30 +++++ .../assets/ironbarrels/lang/es_mx.json | 30 +++++ .../assets/ironbarrels/lang/fr_fr.json | 30 +++++ .../assets/ironbarrels/lang/ko_kr.json | 22 +++ .../assets/ironbarrels/lang/pl_pl.json | 22 +++ .../assets/ironbarrels/lang/zh_cn.json | 22 +++ .../assets/ironbarrels/lang/zh_tw.json | 30 +++++ .../models/block/copper_chest.json | 4 +- .../models/block/crystal_chest.json | 4 +- .../models/block/diamond_chest.json | 4 +- .../models/block/gold_chest.json | 4 +- .../models/block/iron_chest.json | 4 +- .../models/block/obsidian_chest.json} | 4 +- .../models/item/copper_chest.json | 0 .../item/copper_to_iron_chest_upgrade.json | 2 +- .../models/item/crystal_chest.json | 0 .../models/item/diamond_chest.json | 0 .../diamond_to_crystal_chest_upgrade.json | 6 + .../diamond_to_obsidian_chest_upgrade.json | 6 + .../models/item/gold_chest.json | 0 .../item/gold_to_diamond_chest_upgrade.json | 2 +- .../models/item/iron_chest.json | 0 .../item/iron_to_gold_chest_upgrade.json | 2 +- .../models/item/obsidian_chest.json | 0 .../item/wood_to_copper_chest_upgrade.json | 2 +- .../item/wood_to_iron_chest_upgrade.json | 2 +- .../textures/block/copper_break.png | Bin .../textures/block/crystal_break.png | Bin .../textures/block/diamond_break.png | Bin .../textures/block/gold_break.png | Bin .../textures/block/iron_break.png | Bin .../textures/block/silver_break.png | Bin .../textures/gui/copper_container.png | Bin .../textures/gui/diamond_container.png | Bin .../textures/gui/gold_container.png | Bin .../textures/gui/iron_container.png | Bin .../textures/gui/silver_container.png | Bin .../textures/item/copper_iron_upgrade.png | Bin .../textures/item/diamond_crystal_upgrade.png | Bin .../item/diamond_netherite_upgrade.png | Bin .../item/diamond_obsidian_upgrade.png | Bin .../textures/item/gold_diamond_upgrade.png | Bin .../textures/item/iron_gold_upgrade.png | Bin .../textures/item/wood_copper_upgrade.png | Bin .../textures/item/wood_iron_upgrade.png | Bin .../textures/model/copper_chest.png | Bin .../textures/model/crystal_chest.png | Bin .../textures/model/diamond_chest.png | Bin .../textures/model/gold_chest.png | Bin .../textures/model/iron_chest.png | Bin .../textures/model/netherite_chest.png | Bin .../textures/model/obsidian_chest.png | Bin .../ironchest/blockstates/copper_chest.json | 5 - .../ironchest/blockstates/crystal_chest.json | 5 - .../ironchest/blockstates/diamond_chest.json | 5 - .../ironchest/blockstates/dirt_chest.json | 5 - .../ironchest/blockstates/gold_chest.json | 5 - .../ironchest/blockstates/iron_chest.json | 5 - .../ironchest/blockstates/obsidian_chest.json | 5 - .../blockstates/trapped_copper_chest.json | 5 - .../blockstates/trapped_crystal_chest.json | 5 - .../blockstates/trapped_diamond_chest.json | 5 - .../blockstates/trapped_dirt_chest.json | 5 - .../blockstates/trapped_gold_chest.json | 5 - .../blockstates/trapped_iron_chest.json | 5 - .../blockstates/trapped_obsidian_chest.json | 5 - .../assets/ironchest/lang/de_de.json | 43 ------ .../assets/ironchest/lang/en_ud.json | 45 ------- .../assets/ironchest/lang/en_us.json | 50 ------- .../assets/ironchest/lang/es_ar.json | 43 ------ .../assets/ironchest/lang/es_es.json | 43 ------ .../assets/ironchest/lang/es_mx.json | 43 ------ .../assets/ironchest/lang/fr_fr.json | 43 ------ .../assets/ironchest/lang/ko_kr.json | 33 ----- .../assets/ironchest/lang/pl_pl.json | 33 ----- .../assets/ironchest/lang/zh_cn.json | 33 ----- .../assets/ironchest/lang/zh_tw.json | 43 ------ .../models/block/obsidian_chest.json | 42 ------ .../models/block/trapped_copper_chest.json | 42 ------ .../models/block/trapped_crystal_chest.json | 42 ------ .../models/block/trapped_diamond_chest.json | 42 ------ .../models/block/trapped_dirt_chest.json | 42 ------ .../models/block/trapped_gold_chest.json | 42 ------ .../models/block/trapped_iron_chest.json | 42 ------ .../models/block/trapped_obsidian_chest.json | 42 ------ .../diamond_to_crystal_chest_upgrade.json | 6 - .../diamond_to_obsidian_chest_upgrade.json | 6 - .../ironchest/models/item/dirt_chest.json | 35 ----- .../models/item/trapped_copper_chest.json | 35 ----- .../models/item/trapped_crystal_chest.json | 35 ----- .../models/item/trapped_diamond_chest.json | 35 ----- .../models/item/trapped_dirt_chest.json | 35 ----- .../models/item/trapped_gold_chest.json | 35 ----- .../models/item/trapped_iron_chest.json | 35 ----- .../models/item/trapped_obsidian_chest.json | 35 ----- .../ironchest/textures/gui/dirt_container.png | Bin 3588 -> 0 bytes .../ironchest/textures/model/dirt_chest.png | Bin 5452 -> 0 bytes .../textures/model/trapped_copper_chest.png | Bin 5300 -> 0 bytes .../textures/model/trapped_crystal_chest.png | Bin 4435 -> 0 bytes .../textures/model/trapped_diamond_chest.png | Bin 5272 -> 0 bytes .../textures/model/trapped_dirt_chest.png | Bin 5599 -> 0 bytes .../textures/model/trapped_gold_chest.png | Bin 5232 -> 0 bytes .../textures/model/trapped_iron_chest.png | Bin 5236 -> 0 bytes .../model/trapped_netherite_chest.png | Bin 5391 -> 0 bytes .../textures/model/trapped_obsidian_chest.png | Bin 5140 -> 0 bytes .../loot_tables/blocks/copper_chest.json | 26 ++++ .../loot_tables/blocks/crystal_chest.json | 26 ++++ .../loot_tables/blocks/diamond_chest.json | 26 ++++ .../loot_tables/blocks/gold_chest.json | 26 ++++ .../loot_tables/blocks/iron_chest.json | 26 ++++ .../loot_tables/blocks/obsidian_chest.json | 26 ++++ .../loot_tables/blocks/copper_chest.json | 26 ---- .../loot_tables/blocks/crystal_chest.json | 26 ---- .../loot_tables/blocks/diamond_chest.json | 26 ---- .../loot_tables/blocks/dirt_chest.json | 30 ----- .../loot_tables/blocks/gold_chest.json | 26 ---- .../loot_tables/blocks/iron_chest.json | 26 ---- .../loot_tables/blocks/obsidian_chest.json | 26 ---- .../blocks/trapped_copper_chest.json | 26 ---- .../blocks/trapped_crystal_chest.json | 26 ---- .../blocks/trapped_diamond_chest.json | 26 ---- .../blocks/trapped_dirt_chest.json | 30 ----- .../blocks/trapped_gold_chest.json | 26 ---- .../blocks/trapped_iron_chest.json | 26 ---- .../blocks/trapped_obsidian_chest.json | 26 ---- 230 files changed, 1166 insertions(+), 3161 deletions(-) delete mode 100644 src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/ai/CatsSitOnChestsHandler.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/IronChestsTypes.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/entity/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/regular/DirtChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/regular/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/AbstractTrappedIronChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCopperChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCrystalChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDiamondChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDirtChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedGoldChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedIronChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedObsidianChestBlock.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/AbstractTrappedIronChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCopperChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCrystalChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDiamondChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedGoldChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedIronChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedObsidianChestBlockEntity.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/entity/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/block/trapped/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/data/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/inventory/DirtChestSlot.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/inventory/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/item/IronChestBlockItem.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/item/IronChestsUpgradeType.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/item/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/network/helper/package-info.java delete mode 100644 src/main/java/com/progwml6/ironchest/common/network/package-info.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/IronChests.java (66%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/IronChestsClientEvents.java (89%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/client/model/IronChestsModels.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/client/model/inventory/IronChestItemStackRenderer.java (96%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/client/model/inventory/ModelItem.java (95%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/client/model/inventory/package-info.java rename src/main/java/{com/progwml6/ironchest/client/screen => dev/ubujira/ironbarrels/client/model}/package-info.java (78%) rename src/main/java/{com/progwml6/ironchest/common => dev/ubujira/ironbarrels/client}/package-info.java (81%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/client/render/IronChestRenderer.java (85%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/client/render/package-info.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/client/screen/IronChestScreen.java (92%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/client/screen/package-info.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/Util.java (90%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsBlocks.java create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsTypes.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/entity/ICrystalChest.java (94%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/entity/IronChestsBlockEntityTypes.java create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/entity/package-info.java rename src/main/java/{com/progwml6/ironchest/client/render => dev/ubujira/ironbarrels/common/block}/package-info.java (78%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/AbstractIronChestBlock.java (94%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/CopperChestBlock.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/CrystalChestBlock.java (75%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/DiamondChestBlock.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/GoldChestBlock.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/IronChestBlock.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/ObsidianChestBlock.java (70%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/AbstractIronChestBlockEntity.java (91%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/CopperChestBlockEntity.java (68%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/CrystalChestBlockEntity.java (85%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/DiamondChestBlockEntity.java (68%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/GoldChestBlockEntity.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/IronChestBlockEntity.java (67%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/block/regular/entity/ObsidianChestBlockEntity.java (68%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/package-info.java create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/block/regular/package-info.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/data/IronChestsRecipeProvider.java (75%) rename src/main/java/{com/progwml6/ironchest/common/ai => dev/ubujira/ironbarrels/common/data}/package-info.java (79%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/inventory/IronChestMenu.java (85%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/inventory/IronChestsContainerTypes.java (84%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/inventory/package-info.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/item/ChestUpgradeItem.java (80%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/item/IronChestBlockItem.java rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/item/IronChestsItems.java (92%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsUpgradeType.java rename src/main/java/{com/progwml6/ironchest/client/model => dev/ubujira/ironbarrels/common/item}/package-info.java (79%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/network/InventoryTopStacksSyncPacket.java (87%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/network/IronChestNetwork.java (95%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/network/helper/ISimplePacket.java (89%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/common/network/helper/IThreadsafePacket.java (93%) rename src/main/java/{com/progwml6/ironchest/client/model/inventory => dev/ubujira/ironbarrels/common/network/helper}/package-info.java (75%) create mode 100644 src/main/java/dev/ubujira/ironbarrels/common/network/package-info.java rename src/main/java/{com/progwml6/ironchest/client => dev/ubujira/ironbarrels/common}/package-info.java (81%) rename src/main/java/{com/progwml6/ironchest => dev/ubujira/ironbarrels}/package-info.java (83%) create mode 100644 src/main/resources/assets/ironbarrels/blockstates/copper_chest.json create mode 100644 src/main/resources/assets/ironbarrels/blockstates/crystal_chest.json create mode 100644 src/main/resources/assets/ironbarrels/blockstates/diamond_chest.json create mode 100644 src/main/resources/assets/ironbarrels/blockstates/gold_chest.json create mode 100644 src/main/resources/assets/ironbarrels/blockstates/iron_chest.json create mode 100644 src/main/resources/assets/ironbarrels/blockstates/obsidian_chest.json create mode 100644 src/main/resources/assets/ironbarrels/lang/de_de.json create mode 100644 src/main/resources/assets/ironbarrels/lang/en_ud.json create mode 100644 src/main/resources/assets/ironbarrels/lang/en_us.json create mode 100644 src/main/resources/assets/ironbarrels/lang/es_ar.json create mode 100644 src/main/resources/assets/ironbarrels/lang/es_es.json create mode 100644 src/main/resources/assets/ironbarrels/lang/es_mx.json create mode 100644 src/main/resources/assets/ironbarrels/lang/fr_fr.json create mode 100644 src/main/resources/assets/ironbarrels/lang/ko_kr.json create mode 100644 src/main/resources/assets/ironbarrels/lang/pl_pl.json create mode 100644 src/main/resources/assets/ironbarrels/lang/zh_cn.json create mode 100644 src/main/resources/assets/ironbarrels/lang/zh_tw.json rename src/main/resources/assets/{ironchest => ironbarrels}/models/block/copper_chest.json (95%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/block/crystal_chest.json (94%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/block/diamond_chest.json (94%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/block/gold_chest.json (95%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/block/iron_chest.json (95%) rename src/main/resources/assets/{ironchest/models/block/dirt_chest.json => ironbarrels/models/block/obsidian_chest.json} (95%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/copper_chest.json (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/copper_to_iron_chest_upgrade.json (51%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/crystal_chest.json (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/diamond_chest.json (100%) create mode 100644 src/main/resources/assets/ironbarrels/models/item/diamond_to_crystal_chest_upgrade.json create mode 100644 src/main/resources/assets/ironbarrels/models/item/diamond_to_obsidian_chest_upgrade.json rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/gold_chest.json (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/gold_to_diamond_chest_upgrade.json (50%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/iron_chest.json (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/iron_to_gold_chest_upgrade.json (52%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/obsidian_chest.json (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/wood_to_copper_chest_upgrade.json (51%) rename src/main/resources/assets/{ironchest => ironbarrels}/models/item/wood_to_iron_chest_upgrade.json (52%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/copper_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/crystal_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/diamond_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/gold_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/iron_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/block/silver_break.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/gui/copper_container.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/gui/diamond_container.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/gui/gold_container.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/gui/iron_container.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/gui/silver_container.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/copper_iron_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/diamond_crystal_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/diamond_netherite_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/diamond_obsidian_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/gold_diamond_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/iron_gold_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/wood_copper_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/item/wood_iron_upgrade.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/copper_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/crystal_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/diamond_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/gold_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/iron_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/netherite_chest.png (100%) rename src/main/resources/assets/{ironchest => ironbarrels}/textures/model/obsidian_chest.png (100%) delete mode 100644 src/main/resources/assets/ironchest/blockstates/copper_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/crystal_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/diamond_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/dirt_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/gold_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/iron_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/obsidian_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_copper_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_crystal_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_diamond_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_dirt_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_gold_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_iron_chest.json delete mode 100644 src/main/resources/assets/ironchest/blockstates/trapped_obsidian_chest.json delete mode 100644 src/main/resources/assets/ironchest/lang/de_de.json delete mode 100644 src/main/resources/assets/ironchest/lang/en_ud.json delete mode 100644 src/main/resources/assets/ironchest/lang/en_us.json delete mode 100644 src/main/resources/assets/ironchest/lang/es_ar.json delete mode 100644 src/main/resources/assets/ironchest/lang/es_es.json delete mode 100644 src/main/resources/assets/ironchest/lang/es_mx.json delete mode 100644 src/main/resources/assets/ironchest/lang/fr_fr.json delete mode 100644 src/main/resources/assets/ironchest/lang/ko_kr.json delete mode 100644 src/main/resources/assets/ironchest/lang/pl_pl.json delete mode 100644 src/main/resources/assets/ironchest/lang/zh_cn.json delete mode 100644 src/main/resources/assets/ironchest/lang/zh_tw.json delete mode 100644 src/main/resources/assets/ironchest/models/block/obsidian_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_copper_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_crystal_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_diamond_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_dirt_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_gold_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_iron_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/block/trapped_obsidian_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/diamond_to_crystal_chest_upgrade.json delete mode 100644 src/main/resources/assets/ironchest/models/item/diamond_to_obsidian_chest_upgrade.json delete mode 100644 src/main/resources/assets/ironchest/models/item/dirt_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_copper_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_crystal_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_diamond_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_dirt_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_gold_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_iron_chest.json delete mode 100644 src/main/resources/assets/ironchest/models/item/trapped_obsidian_chest.json delete mode 100644 src/main/resources/assets/ironchest/textures/gui/dirt_container.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/dirt_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_copper_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_crystal_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_diamond_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_dirt_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_gold_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_iron_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_netherite_chest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/trapped_obsidian_chest.png create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/copper_chest.json create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/crystal_chest.json create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/diamond_chest.json create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/gold_chest.json create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/iron_chest.json create mode 100644 src/main/resources/data/ironbarrels/loot_tables/blocks/obsidian_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/copper_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/crystal_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/diamond_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/dirt_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/gold_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/iron_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/obsidian_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_copper_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_crystal_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_diamond_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_dirt_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_gold_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_iron_chest.json delete mode 100644 src/main/resources/data/ironchest/loot_tables/blocks/trapped_obsidian_chest.json diff --git a/build.gradle b/build.gradle index 71e111a..67589c3 100755 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ repositories { } } -group = "com.progwml6.ironchest" +group = "dev.ubujira.ironbarrels" // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -190,13 +190,13 @@ processResources { jar { manifest { attributes([ - "Specification-Title" : "Iron Chests", - "Specification-Vendor" : "Progwml6", - "Specification-Version" : "1", // We are version 1 of ourselves - "Implementation-Title" : project.name, - "Implementation-Version" : "${version}", - "Implementation-Vendor" : "Progwml6", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + "Specification-Title" : "Iron Barrels", + "Specification-Vendor" : "Progwml6, Ubujira", + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : "${version}", + "Implementation-Vendor" : "Progwml6, Ubujira", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } } diff --git a/gradle.properties b/gradle.properties index 8c44323..9112715 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,21 +2,16 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false - # Mod Version Information mod_version=13.0 - # Minecraft Version Information minecraft_version=1.18 minecraft_range=[1.18,1.19) - # Forge Version Information loader_range=[38,) -forge_version=38.0.10 -forge_range=[38.0.10,) - +forge_version=38.0.17 +forge_range=[38.0.17,) # Mappings Information mappings_version=1.18 - # Build dependencies jei_version=1.16.4:7.6.1.65 diff --git a/settings.gradle b/settings.gradle index 4ab6f51..1a505f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,4 +16,4 @@ include 'api' include 'services:webservice' */ -rootProject.name = 'ironchest' +rootProject.name = 'ironbarrels' diff --git a/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java b/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java deleted file mode 100644 index f5ded0c..0000000 --- a/src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.progwml6.ironchest.client.model; - -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import net.minecraft.client.renderer.Sheets; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(modid = IronChests.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) -public class IronChestsModels { - - public static final ResourceLocation IRON_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/iron_chest"); - public static final ResourceLocation GOLD_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/gold_chest"); - public static final ResourceLocation DIAMOND_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/diamond_chest"); - public static final ResourceLocation COPPER_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/copper_chest"); - public static final ResourceLocation CRYSTAL_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/crystal_chest"); - public static final ResourceLocation OBSIDIAN_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/obsidian_chest"); - public static final ResourceLocation DIRT_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/dirt_chest"); - public static final ResourceLocation VANILLA_CHEST_LOCATION = new ResourceLocation("entity/chest/normal"); - - public static final ResourceLocation TRAPPED_IRON_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_iron_chest"); - public static final ResourceLocation TRAPPED_GOLD_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_gold_chest"); - public static final ResourceLocation TRAPPED_DIAMOND_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_diamond_chest"); - public static final ResourceLocation TRAPPED_COPPER_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_copper_chest"); - public static final ResourceLocation TRAPPED_CRYSTAL_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_crystal_chest"); - public static final ResourceLocation TRAPPED_OBSIDIAN_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_obsidian_chest"); - public static final ResourceLocation TRAPPED_DIRT_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/trapped_dirt_chest"); - public static final ResourceLocation TRAPPED_VANILLA_CHEST_LOCATION = new ResourceLocation("entity/chest/trapped"); - - public static ResourceLocation chooseChestTexture(IronChestsTypes type, boolean trapped) { - if (trapped) - return switch (type) { - case IRON -> TRAPPED_IRON_CHEST_LOCATION; - case GOLD -> TRAPPED_GOLD_CHEST_LOCATION; - case DIAMOND -> TRAPPED_DIAMOND_CHEST_LOCATION; - case COPPER -> TRAPPED_COPPER_CHEST_LOCATION; - case CRYSTAL -> TRAPPED_CRYSTAL_CHEST_LOCATION; - case OBSIDIAN -> TRAPPED_OBSIDIAN_CHEST_LOCATION; - case DIRT -> TRAPPED_DIRT_CHEST_LOCATION; - default -> TRAPPED_VANILLA_CHEST_LOCATION; - }; - else - return switch (type) { - case IRON -> IRON_CHEST_LOCATION; - case GOLD -> GOLD_CHEST_LOCATION; - case DIAMOND -> DIAMOND_CHEST_LOCATION; - case COPPER -> COPPER_CHEST_LOCATION; - case CRYSTAL -> CRYSTAL_CHEST_LOCATION; - case OBSIDIAN -> OBSIDIAN_CHEST_LOCATION; - case DIRT -> DIRT_CHEST_LOCATION; - default -> VANILLA_CHEST_LOCATION; - }; - } - - @SubscribeEvent - public static void onStitch(TextureStitchEvent.Pre event) { - if (!event.getAtlas().location().equals(Sheets.CHEST_SHEET)) { - return; - } - - event.addSprite(IRON_CHEST_LOCATION); - event.addSprite(GOLD_CHEST_LOCATION); - event.addSprite(DIAMOND_CHEST_LOCATION); - event.addSprite(COPPER_CHEST_LOCATION); - event.addSprite(CRYSTAL_CHEST_LOCATION); - event.addSprite(OBSIDIAN_CHEST_LOCATION); - event.addSprite(DIRT_CHEST_LOCATION); - - event.addSprite(TRAPPED_IRON_CHEST_LOCATION); - event.addSprite(TRAPPED_GOLD_CHEST_LOCATION); - event.addSprite(TRAPPED_DIAMOND_CHEST_LOCATION); - event.addSprite(TRAPPED_COPPER_CHEST_LOCATION); - event.addSprite(TRAPPED_CRYSTAL_CHEST_LOCATION); - event.addSprite(TRAPPED_OBSIDIAN_CHEST_LOCATION); - event.addSprite(TRAPPED_DIRT_CHEST_LOCATION); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/ai/CatsSitOnChestsHandler.java b/src/main/java/com/progwml6/ironchest/common/ai/CatsSitOnChestsHandler.java deleted file mode 100644 index 71a40ac..0000000 --- a/src/main/java/com/progwml6/ironchest/common/ai/CatsSitOnChestsHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.progwml6.ironchest.common.ai; - -import com.progwml6.ironchest.IronChests; -import net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal; -import net.minecraft.world.entity.ai.goal.WrappedGoal; -import net.minecraft.world.entity.animal.Cat; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import java.util.HashSet; - -@Mod.EventBusSubscriber(modid = IronChests.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) -public class CatsSitOnChestsHandler { - - @SubscribeEvent - static void changeSittingTaskForOcelots(final LivingEvent.LivingUpdateEvent evt) { - if (evt.getEntityLiving().tickCount < 5 && evt.getEntityLiving() instanceof Cat cat) { - HashSet goals = new HashSet<>(); - - for (WrappedGoal goal : cat.goalSelector.availableGoals) { - if (goal.getGoal().getClass() == CatSitOnBlockGoal.class) { - goals.add(goal); - } - } - - for (WrappedGoal goal : goals) { - cat.goalSelector.removeGoal(goal.getGoal()); - cat.goalSelector.addGoal(goal.getPriority(), new IronChestCatSitOnBlockGoal(cat, 0.4F)); - } - } - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java b/src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java deleted file mode 100644 index a4c66b9..0000000 --- a/src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.progwml6.ironchest.common.ai; - -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.entity.ai.goal.CatSitOnBlockGoal; -import net.minecraft.world.entity.animal.Cat; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.LevelReader; - -public class IronChestCatSitOnBlockGoal extends CatSitOnBlockGoal { - - public IronChestCatSitOnBlockGoal(Cat cat, double speedModifier) { - super(cat, speedModifier); - } - - @Override - protected boolean isValidTarget(LevelReader worldIn, BlockPos pos) { - if (!worldIn.isEmptyBlock(pos.above())) { - return false; - } else { - BlockState blockstate = worldIn.getBlockState(pos); - Block block = blockstate.getBlock(); - - if (block instanceof AbstractIronChestBlock) { - return AbstractIronChestBlockEntity.getOpenCount(worldIn, pos) < 1; - } - - return super.isValidTarget(worldIn, pos); - } - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java b/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java deleted file mode 100644 index 38c249f..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.progwml6.ironchest.common.block; - -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.block.regular.CopperChestBlock; -import com.progwml6.ironchest.common.block.regular.CrystalChestBlock; -import com.progwml6.ironchest.common.block.regular.DiamondChestBlock; -import com.progwml6.ironchest.common.block.regular.DirtChestBlock; -import com.progwml6.ironchest.common.block.regular.GoldChestBlock; -import com.progwml6.ironchest.common.block.regular.IronChestBlock; -import com.progwml6.ironchest.common.block.regular.ObsidianChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedCopperChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedCrystalChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedDiamondChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedDirtChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedGoldChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedIronChestBlock; -import com.progwml6.ironchest.common.block.trapped.TrappedObsidianChestBlock; -import com.progwml6.ironchest.common.item.IronChestBlockItem; -import com.progwml6.ironchest.common.item.IronChestsItems; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Material; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.concurrent.Callable; -import java.util.function.Function; -import java.util.function.Supplier; - -public class IronChestsBlocks { - - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, IronChests.MOD_ID); - public static final DeferredRegister ITEMS = IronChestsItems.ITEMS; - - public static final RegistryObject IRON_CHEST = register( - "iron_chest", () -> new IronChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.IRON, false); - - public static final RegistryObject GOLD_CHEST = register( - "gold_chest", () -> new GoldChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.GOLD, false); - - public static final RegistryObject DIAMOND_CHEST = register( - "diamond_chest", () -> new DiamondChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.DIAMOND, false); - - public static final RegistryObject COPPER_CHEST = register( - "copper_chest", () -> new CopperChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.COPPER, false); - - public static final RegistryObject CRYSTAL_CHEST = register( - "crystal_chest", () -> new CrystalChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.CRYSTAL, false); - - public static final RegistryObject OBSIDIAN_CHEST = register( - "obsidian_chest", () -> new ObsidianChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.OBSIDIAN, false); - - public static final RegistryObject DIRT_CHEST = register( - "dirt_chest", () -> new DirtChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.DIRT, false); - - // Trapped Chests - public static final RegistryObject TRAPPED_IRON_CHEST = register( - "trapped_iron_chest", () -> new TrappedIronChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.IRON, true); - - public static final RegistryObject TRAPPED_GOLD_CHEST = register( - "trapped_gold_chest", () -> new TrappedGoldChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.GOLD, true); - - public static final RegistryObject TRAPPED_DIAMOND_CHEST = register( - "trapped_diamond_chest", () -> new TrappedDiamondChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.DIAMOND, true); - - public static final RegistryObject TRAPPED_COPPER_CHEST = register( - "trapped_copper_chest", () -> new TrappedCopperChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.COPPER, true); - - public static final RegistryObject TRAPPED_CRYSTAL_CHEST = register( - "trapped_crystal_chest", () -> new TrappedCrystalChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.CRYSTAL, true); - - public static final RegistryObject TRAPPED_OBSIDIAN_CHEST = register( - "trapped_obsidian_chest", () -> new TrappedObsidianChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.OBSIDIAN, true); - - public static final RegistryObject TRAPPED_DIRT_CHEST = register( - "trapped_dirt_chest", () -> new TrappedDirtChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), - IronChestsTypes.DIRT, true); - - //HELPERS - - private static RegistryObject register(String name, Supplier sup, IronChestsTypes chestType, boolean trapped) { - return register(name, sup, block -> item(block, () -> () -> chestType, () -> () -> trapped)); - } - - private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) { - RegistryObject ret = registerNoItem(name, sup); - ITEMS.register(name, itemCreator.apply(ret)); - return ret; - } - - private static RegistryObject registerNoItem(String name, Supplier sup) { - return BLOCKS.register(name, sup); - } - - private static Supplier item(final RegistryObject block, Supplier> chestType, Supplier> trapped) { - return () -> new IronChestBlockItem(block.get(), new Item.Properties().tab(IronChests.IRONCHESTS_ITEM_GROUP), chestType, trapped); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/IronChestsTypes.java b/src/main/java/com/progwml6/ironchest/common/block/IronChestsTypes.java deleted file mode 100644 index 1c263dd..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/IronChestsTypes.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.progwml6.ironchest.common.block; - -import com.progwml6.ironchest.common.Util; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.CrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.ObsidianChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCopperChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDirtChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedGoldChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.util.StringRepresentable; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -public enum IronChestsTypes implements StringRepresentable { - - IRON(54, 9, 184, 222, new ResourceLocation("ironchest", "textures/gui/iron_container.png"), 256, 256), - GOLD(81, 9, 184, 276, new ResourceLocation("ironchest", "textures/gui/gold_container.png"), 256, 276), - DIAMOND(108, 12, 238, 276, new ResourceLocation("ironchest", "textures/gui/diamond_container.png"), 256, 276), - COPPER(45, 9, 184, 204, new ResourceLocation("ironchest", "textures/gui/copper_container.png"), 256, 256), - CRYSTAL(108, 12, 238, 276, new ResourceLocation("ironchest", "textures/gui/diamond_container.png"), 256, 276), - OBSIDIAN(108, 12, 238, 276, new ResourceLocation("ironchest", "textures/gui/diamond_container.png"), 256, 276), - DIRT(1, 1, 184, 184, new ResourceLocation("ironchest", "textures/gui/dirt_container.png"), 256, 256), - WOOD(0, 0, 0, 0, null, 0, 0); - - private final String name; - public final int size; - public final int rowLength; - public final int xSize; - public final int ySize; - public final ResourceLocation guiTexture; - public final int textureXSize; - public final int textureYSize; - - IronChestsTypes(int size, int rowLength, int xSize, int ySize, ResourceLocation guiTexture, int textureXSize, int textureYSize) { - this(null, size, rowLength, xSize, ySize, guiTexture, textureXSize, textureYSize); - } - - IronChestsTypes(@Nullable String name, int size, int rowLength, int xSize, int ySize, ResourceLocation guiTexture, int textureXSize, int textureYSize) { - this.name = name == null ? Util.toEnglishName(this.name()) : name; - this.size = size; - this.rowLength = rowLength; - this.xSize = xSize; - this.ySize = ySize; - this.guiTexture = guiTexture; - this.textureXSize = textureXSize; - this.textureYSize = textureYSize; - } - - public String getId() { - return this.name().toLowerCase(Locale.ROOT); - } - - public String getEnglishName() { - return this.name; - } - - @Override - public String getSerializedName() { - return this.getEnglishName(); - } - - public int getRowCount() { - return this.size / this.rowLength; - } - - public boolean isTransparent() { - return this == CRYSTAL; - } - - public static List get(IronChestsTypes type) { - return switch (type) { - case IRON -> Arrays.asList(IronChestsBlocks.IRON_CHEST.get(), IronChestsBlocks.TRAPPED_IRON_CHEST.get()); - case GOLD -> Arrays.asList(IronChestsBlocks.GOLD_CHEST.get(), IronChestsBlocks.TRAPPED_GOLD_CHEST.get()); - case DIAMOND -> Arrays.asList(IronChestsBlocks.DIAMOND_CHEST.get(), IronChestsBlocks.TRAPPED_DIAMOND_CHEST.get()); - case COPPER -> Arrays.asList(IronChestsBlocks.COPPER_CHEST.get(), IronChestsBlocks.TRAPPED_COPPER_CHEST.get()); - case CRYSTAL -> Arrays.asList(IronChestsBlocks.CRYSTAL_CHEST.get(), IronChestsBlocks.TRAPPED_CRYSTAL_CHEST.get()); - case OBSIDIAN -> Arrays.asList(IronChestsBlocks.OBSIDIAN_CHEST.get(), IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST.get()); - case DIRT -> Arrays.asList(IronChestsBlocks.DIRT_CHEST.get(), IronChestsBlocks.TRAPPED_DIRT_CHEST.get()); - default -> List.of(Blocks.CHEST); - }; - } - - @Nullable - public AbstractIronChestBlockEntity makeEntity(BlockPos blockPos, BlockState blockState, boolean trapped) { - if(trapped) { - return switch (this) { - case IRON -> new TrappedIronChestBlockEntity(blockPos, blockState); - case GOLD -> new TrappedGoldChestBlockEntity(blockPos, blockState); - case DIAMOND -> new TrappedDiamondChestBlockEntity(blockPos, blockState); - case COPPER -> new TrappedCopperChestBlockEntity(blockPos, blockState); - case CRYSTAL -> new TrappedCrystalChestBlockEntity(blockPos, blockState); - case OBSIDIAN -> new TrappedObsidianChestBlockEntity(blockPos, blockState); - case DIRT -> new TrappedDirtChestBlockEntity(blockPos, blockState); - default -> null; - }; - } else { - return switch (this) { - case IRON -> new IronChestBlockEntity(blockPos, blockState); - case GOLD -> new GoldChestBlockEntity(blockPos, blockState); - case DIAMOND -> new DiamondChestBlockEntity(blockPos, blockState); - case COPPER -> new CopperChestBlockEntity(blockPos, blockState); - case CRYSTAL -> new CrystalChestBlockEntity(blockPos, blockState); - case OBSIDIAN -> new ObsidianChestBlockEntity(blockPos, blockState); - case DIRT -> new DirtChestBlockEntity(blockPos, blockState); - default -> null; - }; - } - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java b/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java deleted file mode 100644 index d189535..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/entity/IronChestsBlockEntityTypes.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.progwml6.ironchest.common.block.entity; - -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.CrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.ObsidianChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCopperChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDirtChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedGoldChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity; - -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -public class IronChestsBlockEntityTypes { - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, IronChests.MOD_ID); - - public static final RegistryObject> IRON_CHEST = BLOCK_ENTITIES.register( - "iron_chest", () -> BlockEntityType.Builder.of(IronChestBlockEntity::new, IronChestsBlocks.IRON_CHEST.get()).build(null)); - - public static final RegistryObject> GOLD_CHEST = BLOCK_ENTITIES.register( - "gold_chest", () -> BlockEntityType.Builder.of(GoldChestBlockEntity::new, IronChestsBlocks.GOLD_CHEST.get()).build(null)); - - public static final RegistryObject> DIAMOND_CHEST = BLOCK_ENTITIES.register( - "diamond_chest", () -> BlockEntityType.Builder.of(DiamondChestBlockEntity::new, IronChestsBlocks.DIAMOND_CHEST.get()).build(null)); - - public static final RegistryObject> COPPER_CHEST = BLOCK_ENTITIES.register( - "copper_chest", () -> BlockEntityType.Builder.of(CopperChestBlockEntity::new, IronChestsBlocks.COPPER_CHEST.get()).build(null)); - - public static final RegistryObject> CRYSTAL_CHEST = BLOCK_ENTITIES.register( - "crystal_chest", () -> BlockEntityType.Builder.of(CrystalChestBlockEntity::new, IronChestsBlocks.CRYSTAL_CHEST.get()).build(null)); - - public static final RegistryObject> OBSIDIAN_CHEST = BLOCK_ENTITIES.register( - "obsidian_chest", () -> BlockEntityType.Builder.of(ObsidianChestBlockEntity::new, IronChestsBlocks.OBSIDIAN_CHEST.get()).build(null)); - - public static final RegistryObject> DIRT_CHEST = BLOCK_ENTITIES.register( - "dirt_chest", () -> BlockEntityType.Builder.of(DirtChestBlockEntity::new, IronChestsBlocks.DIRT_CHEST.get()).build(null)); - - // Trapped Chests - - public static final RegistryObject> TRAPPED_IRON_CHEST = BLOCK_ENTITIES.register( - "trapped_iron_chest", () -> BlockEntityType.Builder.of(TrappedIronChestBlockEntity::new, IronChestsBlocks.TRAPPED_IRON_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_GOLD_CHEST = BLOCK_ENTITIES.register( - "trapped_gold_chest", () -> BlockEntityType.Builder.of(TrappedGoldChestBlockEntity::new, IronChestsBlocks.TRAPPED_GOLD_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_DIAMOND_CHEST = BLOCK_ENTITIES.register( - "trapped_diamond_chest", () -> BlockEntityType.Builder.of(TrappedDiamondChestBlockEntity::new, IronChestsBlocks.TRAPPED_DIAMOND_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_COPPER_CHEST = BLOCK_ENTITIES.register( - "trapped_copper_chest", () -> BlockEntityType.Builder.of(TrappedCopperChestBlockEntity::new, IronChestsBlocks.TRAPPED_COPPER_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_CRYSTAL_CHEST = BLOCK_ENTITIES.register( - "trapped_crystal_chest", () -> BlockEntityType.Builder.of(TrappedCrystalChestBlockEntity::new, IronChestsBlocks.TRAPPED_CRYSTAL_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_OBSIDIAN_CHEST = BLOCK_ENTITIES.register( - "trapped_obsidian_chest", () -> BlockEntityType.Builder.of(TrappedObsidianChestBlockEntity::new, IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST.get()).build(null)); - - public static final RegistryObject> TRAPPED_DIRT_CHEST = BLOCK_ENTITIES.register( - "trapped_dirt_chest", () -> BlockEntityType.Builder.of(TrappedDirtChestBlockEntity::new, IronChestsBlocks.TRAPPED_DIRT_CHEST.get()).build(null)); -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/entity/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/entity/package-info.java deleted file mode 100644 index 79c16fc..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/entity/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/package-info.java deleted file mode 100644 index ad13330..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/DirtChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/regular/DirtChestBlock.java deleted file mode 100644 index 4c8d002..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/DirtChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.regular; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class DirtChestBlock extends AbstractIronChestBlock { - - public DirtChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.DIRT_CHEST::get, IronChestsTypes.DIRT); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new DirtChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java deleted file mode 100644 index 2ae6031..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.progwml6.ironchest.common.block.regular.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.client.resources.language.I18n; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; -import java.util.Objects; - -public class DirtChestBlockEntity extends AbstractIronChestBlockEntity { - - private static ItemStack DIRT_CHEST_BOOK = new ItemStack(Items.WRITTEN_BOOK); - - private static boolean bookDataCreated = false; - - public DirtChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.DIRT_CHEST.get(), blockPos, blockState, IronChestsTypes.DIRT, IronChestsBlocks.DIRT_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createDirtContainer(containerId, playerInventory, this); - } - - @Override - public void wasPlaced(@Nullable LivingEntity livingEntity, ItemStack itemStack) { - if (!(itemStack.hasTag() && Objects.requireNonNull(itemStack.getTag()).getBoolean("been_placed"))) { - //TODO FIX BOOK - //this.setInventorySlotContents(0, DIRT_CHEST_BOOK.copy()); - } - - if (!bookDataCreated) { - //createBookData(); - } - } - - @Override - public void removeAdornments() { - if (!this.getItems().get(0).isEmpty() && this.getItems().get(0).sameItem(DIRT_CHEST_BOOK)) { - this.getItems().set(0, ItemStack.EMPTY); - } - } - - private static void createBookData() { - DIRT_CHEST_BOOK.addTagElement("author", StringTag.valueOf("cpw")); - - DIRT_CHEST_BOOK.addTagElement("title", StringTag.valueOf(I18n.get("book.ironchest.dirtchest9000.title"))); - - ListTag pages = new ListTag(); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page1")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page2")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page3")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page4")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page5")))); - - DIRT_CHEST_BOOK.addTagElement("pages", pages); - - bookDataCreated = true; - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java deleted file mode 100644 index 67249c2..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block.regular.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/regular/package-info.java deleted file mode 100644 index e3e360c..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block.regular; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/AbstractTrappedIronChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/AbstractTrappedIronChestBlock.java deleted file mode 100644 index 9ad3359..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/AbstractTrappedIronChestBlock.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.AbstractTrappedIronChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.stats.Stat; -import net.minecraft.stats.Stats; -import net.minecraft.util.Mth; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import java.util.function.Supplier; - -public abstract class AbstractTrappedIronChestBlock extends AbstractIronChestBlock { - - public AbstractTrappedIronChestBlock(Properties properties, Supplier> blockEntityType, IronChestsTypes type) { - super(properties, blockEntityType, type); - } - - @Override - protected Stat getOpenChestStat() { - return Stats.CUSTOM.get(Stats.TRIGGER_TRAPPED_CHEST); - } - - @Override - public boolean isSignalSource(BlockState blockState) { - return true; - } - - @Override - public int getSignal(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, Direction direction) { - return Mth.clamp(AbstractTrappedIronChestBlockEntity.getOpenCount(blockGetter, blockPos), 0, 15); - } - - @Override - public int getDirectSignal(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, Direction direction) { - return direction == Direction.UP ? blockState.getSignal(blockGetter, blockPos, direction) : 0; - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCopperChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCopperChestBlock.java deleted file mode 100644 index 919a98f..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCopperChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCopperChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedCopperChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedCopperChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_COPPER_CHEST::get, IronChestsTypes.COPPER); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedCopperChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCrystalChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCrystalChestBlock.java deleted file mode 100644 index 6612c73..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedCrystalChestBlock.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedCrystalChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedCrystalChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_CRYSTAL_CHEST::get, IronChestsTypes.CRYSTAL); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedCrystalChestBlockEntity(blockPos, blockState); - } - - @Override - @Nullable - public BlockEntityTicker getTicker(Level level, BlockState blockState, BlockEntityType blockEntityType) { - return level.isClientSide ? createTickerHelper(blockEntityType, this.blockEntityType(), AbstractIronChestBlockEntity::lidAnimateTick) : createTickerHelper(blockEntityType, this.blockEntityType(), TrappedCrystalChestBlockEntity::tick); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDiamondChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDiamondChestBlock.java deleted file mode 100644 index 41e34ea..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDiamondChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDiamondChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedDiamondChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedDiamondChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_DIAMOND_CHEST::get, IronChestsTypes.DIAMOND); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedDiamondChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDirtChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDirtChestBlock.java deleted file mode 100644 index 862e28c..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedDirtChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDirtChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedDirtChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedDirtChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_DIRT_CHEST::get, IronChestsTypes.DIRT); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedDirtChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedGoldChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedGoldChestBlock.java deleted file mode 100644 index 66bc125..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedGoldChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedGoldChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedGoldChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedGoldChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_GOLD_CHEST::get, IronChestsTypes.GOLD); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedGoldChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedIronChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedIronChestBlock.java deleted file mode 100644 index e5571c5..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedIronChestBlock.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedIronChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedIronChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_IRON_CHEST::get, IronChestsTypes.IRON); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedIronChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedObsidianChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedObsidianChestBlock.java deleted file mode 100644 index d70a964..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/TrappedObsidianChestBlock.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; - -public class TrappedObsidianChestBlock extends AbstractTrappedIronChestBlock { - - public TrappedObsidianChestBlock(Properties properties) { - super(properties, IronChestsBlockEntityTypes.TRAPPED_OBSIDIAN_CHEST::get, IronChestsTypes.OBSIDIAN); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return new TrappedObsidianChestBlockEntity(blockPos, blockState); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/AbstractTrappedIronChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/AbstractTrappedIronChestBlockEntity.java deleted file mode 100644 index 01b4823..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/AbstractTrappedIronChestBlockEntity.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import java.util.function.Supplier; - -public abstract class AbstractTrappedIronChestBlockEntity extends AbstractIronChestBlockEntity { - - protected AbstractTrappedIronChestBlockEntity(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState, IronChestsTypes chestTypeIn, Supplier blockToUseIn) { - super(blockEntityType, blockPos, blockState, chestTypeIn, blockToUseIn); - } - - @Override - protected void signalOpenCount(Level level, BlockPos blockPos, BlockState blockState, int previousCount, int newCount) { - super.signalOpenCount(level, blockPos, blockState, previousCount, newCount); - - if (previousCount != newCount) { - Block block = blockState.getBlock(); - - level.updateNeighborsAt(blockPos, block); - level.updateNeighborsAt(blockPos.below(), block); - } - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCopperChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCopperChestBlockEntity.java deleted file mode 100644 index b5bae16..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCopperChestBlockEntity.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedCopperChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - public TrappedCopperChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_COPPER_CHEST.get(), blockPos, blockState, IronChestsTypes.COPPER, IronChestsBlocks.TRAPPED_COPPER_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createCopperContainer(containerId, playerInventory, this); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCrystalChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCrystalChestBlockEntity.java deleted file mode 100644 index 6417559..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedCrystalChestBlockEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.ICrystalChest; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.core.NonNullList; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedCrystalChestBlockEntity extends AbstractTrappedIronChestBlockEntity implements ICrystalChest { - - private NonNullList topStacks; - private boolean inventoryTouched; - private boolean hadStuff; - - public TrappedCrystalChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_CRYSTAL_CHEST.get(), blockPos, blockState, IronChestsTypes.CRYSTAL, IronChestsBlocks.TRAPPED_CRYSTAL_CHEST::get); - - this.topStacks = NonNullList.withSize(8, ItemStack.EMPTY); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createCrystalContainer(containerId, playerInventory, this); - } - - public static void tick(Level level, BlockPos blockPos, BlockState blockState, AbstractIronChestBlockEntity chestBlockEntity) { - if (chestBlockEntity instanceof TrappedCrystalChestBlockEntity crystalChest) { - if (!level.isClientSide && crystalChest.inventoryTouched) { - crystalChest.inventoryTouched = false; - - crystalChest.sortTopStacks(); - } - } - } - - @Override - public void setItems(NonNullList contents) { - super.setItems(contents); - - this.inventoryTouched = true; - } - - @Override - public ItemStack getItem(int index) { - this.inventoryTouched = true; - - return super.getItem(index); - } - - @Override - public NonNullList getTopItems() { - return this.topStacks; - } - - @Override - public Level getChestLevel() { - return this.level; - } - - @Override - public BlockPos getChestWorldPosition() { - return this.worldPosition; - } - - @Override - public void receiveMessageFromServer(NonNullList topStacks) { - this.topStacks = topStacks; - } - - @Override - public NonNullList getCurrentItems() { - return this.getItems(); - } - - @Override - public void setHadStuff(boolean hadStuff) { - this.hadStuff = hadStuff; - } - - @Override - public boolean getHadStuff() { - return this.hadStuff; - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDiamondChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDiamondChestBlockEntity.java deleted file mode 100644 index 263503f..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDiamondChestBlockEntity.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedDiamondChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - public TrappedDiamondChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_DIAMOND_CHEST.get(), blockPos, blockState, IronChestsTypes.DIAMOND, IronChestsBlocks.TRAPPED_DIAMOND_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createDiamondContainer(containerId, playerInventory, this); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java deleted file mode 100644 index 2bff494..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.client.resources.language.I18n; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; -import java.util.Objects; - -public class TrappedDirtChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - private static ItemStack DIRT_CHEST_BOOK = new ItemStack(Items.WRITTEN_BOOK); - - private static boolean bookDataCreated = false; - - public TrappedDirtChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_DIRT_CHEST.get(), blockPos, blockState, IronChestsTypes.DIRT, IronChestsBlocks.TRAPPED_DIRT_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createDirtContainer(containerId, playerInventory, this); - } - - @Override - public void wasPlaced(@Nullable LivingEntity livingEntity, ItemStack itemStack) { - if (!(itemStack.hasTag() && Objects.requireNonNull(itemStack.getTag()).getBoolean("been_placed"))) { - //TODO FIX BOOK - //this.setInventorySlotContents(0, DIRT_CHEST_BOOK.copy()); - } - - if (!bookDataCreated) { - //createBookData(); - } - } - - @Override - public void removeAdornments() { - if (!this.getItems().get(0).isEmpty() && this.getItems().get(0).sameItem(DIRT_CHEST_BOOK)) { - this.getItems().set(0, ItemStack.EMPTY); - } - } - - private static void createBookData() { - DIRT_CHEST_BOOK.addTagElement("author", StringTag.valueOf("cpw")); - - DIRT_CHEST_BOOK.addTagElement("title", StringTag.valueOf(I18n.get("book.ironchest.dirtchest9000.title"))); - - ListTag pages = new ListTag(); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page1")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page2")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page3")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page4")))); - pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page5")))); - - DIRT_CHEST_BOOK.addTagElement("pages", pages); - - bookDataCreated = true; - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedGoldChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedGoldChestBlockEntity.java deleted file mode 100644 index 0b93670..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedGoldChestBlockEntity.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedGoldChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - public TrappedGoldChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_GOLD_CHEST.get(), blockPos, blockState, IronChestsTypes.GOLD, IronChestsBlocks.TRAPPED_GOLD_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createGoldContainer(containerId, playerInventory, this); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedIronChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedIronChestBlockEntity.java deleted file mode 100644 index 97ba93f..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedIronChestBlockEntity.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedIronChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - public TrappedIronChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_IRON_CHEST.get(), blockPos, blockState, IronChestsTypes.IRON, IronChestsBlocks.TRAPPED_IRON_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createIronContainer(containerId, playerInventory, this); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedObsidianChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedObsidianChestBlockEntity.java deleted file mode 100644 index bb3b719..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/TrappedObsidianChestBlockEntity.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.progwml6.ironchest.common.block.trapped.entity; - -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.level.block.state.BlockState; - -public class TrappedObsidianChestBlockEntity extends AbstractTrappedIronChestBlockEntity { - - public TrappedObsidianChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(IronChestsBlockEntityTypes.TRAPPED_OBSIDIAN_CHEST.get(), blockPos, blockState, IronChestsTypes.OBSIDIAN, IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST::get); - } - - @Override - protected AbstractContainerMenu createMenu(int containerId, Inventory playerInventory) { - return IronChestMenu.createObsidianContainer(containerId, playerInventory, this); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/package-info.java deleted file mode 100644 index 20e28bb..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/entity/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block.trapped.entity; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/trapped/package-info.java b/src/main/java/com/progwml6/ironchest/common/block/trapped/package-info.java deleted file mode 100644 index 4006f14..0000000 --- a/src/main/java/com/progwml6/ironchest/common/block/trapped/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.block.trapped; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/data/package-info.java b/src/main/java/com/progwml6/ironchest/common/data/package-info.java deleted file mode 100644 index 6660673..0000000 --- a/src/main/java/com/progwml6/ironchest/common/data/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.data; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/inventory/DirtChestSlot.java b/src/main/java/com/progwml6/ironchest/common/inventory/DirtChestSlot.java deleted file mode 100644 index bc4294c..0000000 --- a/src/main/java/com/progwml6/ironchest/common/inventory/DirtChestSlot.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.progwml6.ironchest.common.inventory; - -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.Container; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -public class DirtChestSlot extends Slot { - - public DirtChestSlot(Container inventoryIn, int slotIndex, int xPosition, int yPosition) { - super(inventoryIn, slotIndex, xPosition, yPosition); - } - - @Override - public boolean mayPlace(ItemStack stack) { - return stack.isEmpty() || stack.getItem() == Item.byBlock(Blocks.DIRT); - } -} \ No newline at end of file diff --git a/src/main/java/com/progwml6/ironchest/common/inventory/package-info.java b/src/main/java/com/progwml6/ironchest/common/inventory/package-info.java deleted file mode 100644 index 3dfff89..0000000 --- a/src/main/java/com/progwml6/ironchest/common/inventory/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.inventory; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/item/IronChestBlockItem.java b/src/main/java/com/progwml6/ironchest/common/item/IronChestBlockItem.java deleted file mode 100644 index bacdeb9..0000000 --- a/src/main/java/com/progwml6/ironchest/common/item/IronChestBlockItem.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.progwml6.ironchest.common.item; - -import com.progwml6.ironchest.client.model.inventory.IronChestItemStackRenderer; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.CrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.DirtChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.ObsidianChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCopperChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedCrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedDirtChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedGoldChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.TrappedObsidianChestBlockEntity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; -import net.minecraft.core.BlockPos; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.IItemRenderProperties; -import net.minecraftforge.fml.DistExecutor; - -import java.util.concurrent.Callable; -import java.util.function.Consumer; -import java.util.function.Supplier; - -public class IronChestBlockItem extends BlockItem { - - protected Supplier type; - - protected Supplier trapped; - - public IronChestBlockItem(Block block, Properties properties, Supplier> type, Supplier> trapped) { - super(block, properties); - - IronChestsTypes tempType = DistExecutor.callWhenOn(Dist.CLIENT, type); - Boolean tempTrapped = DistExecutor.callWhenOn(Dist.CLIENT, trapped); - - this.type = tempType == null ? null : () -> tempType; - this.trapped = tempTrapped == null ? null : () -> tempTrapped; - } - - @Override - public void initializeClient(Consumer consumer) { - super.initializeClient(consumer); - - consumer.accept(new IItemRenderProperties() { - @Override - public BlockEntityWithoutLevelRenderer getItemStackRenderer() { - Supplier modelToUse; - - if (trapped.get()) { - switch (type.get()) { - case GOLD -> modelToUse = () -> new TrappedGoldChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_GOLD_CHEST.get().defaultBlockState()); - case DIAMOND -> modelToUse = () -> new TrappedDiamondChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_DIAMOND_CHEST.get().defaultBlockState()); - case COPPER -> modelToUse = () -> new TrappedCopperChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_COPPER_CHEST.get().defaultBlockState()); - case CRYSTAL -> modelToUse = () -> new TrappedCrystalChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_CRYSTAL_CHEST.get().defaultBlockState()); - case OBSIDIAN -> modelToUse = () -> new TrappedObsidianChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST.get().defaultBlockState()); - case DIRT -> modelToUse = () -> new TrappedDirtChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_DIRT_CHEST.get().defaultBlockState()); - default -> modelToUse = () -> new TrappedIronChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.TRAPPED_IRON_CHEST.get().defaultBlockState()); - } - } else { - switch (type.get()) { - case GOLD -> modelToUse = () -> new GoldChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.GOLD_CHEST.get().defaultBlockState()); - case DIAMOND -> modelToUse = () -> new DiamondChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.DIAMOND_CHEST.get().defaultBlockState()); - case COPPER -> modelToUse = () -> new CopperChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.COPPER_CHEST.get().defaultBlockState()); - case CRYSTAL -> modelToUse = () -> new CrystalChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.CRYSTAL_CHEST.get().defaultBlockState()); - case OBSIDIAN -> modelToUse = () -> new ObsidianChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.OBSIDIAN_CHEST.get().defaultBlockState()); - case DIRT -> modelToUse = () -> new DirtChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.DIRT_CHEST.get().defaultBlockState()); - default -> modelToUse = () -> new IronChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.IRON_CHEST.get().defaultBlockState()); - } - } - - return new IronChestItemStackRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels(), modelToUse); - } - }); - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/item/IronChestsUpgradeType.java b/src/main/java/com/progwml6/ironchest/common/item/IronChestsUpgradeType.java deleted file mode 100644 index 898ead0..0000000 --- a/src/main/java/com/progwml6/ironchest/common/item/IronChestsUpgradeType.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.progwml6.ironchest.common.item; - -import com.progwml6.ironchest.common.Util; -import com.progwml6.ironchest.common.block.IronChestsTypes; - -import static com.progwml6.ironchest.common.block.IronChestsTypes.COPPER; -import static com.progwml6.ironchest.common.block.IronChestsTypes.CRYSTAL; -import static com.progwml6.ironchest.common.block.IronChestsTypes.DIAMOND; -import static com.progwml6.ironchest.common.block.IronChestsTypes.GOLD; -import static com.progwml6.ironchest.common.block.IronChestsTypes.IRON; -import static com.progwml6.ironchest.common.block.IronChestsTypes.OBSIDIAN; -import static com.progwml6.ironchest.common.block.IronChestsTypes.WOOD; - -public enum IronChestsUpgradeType { - - IRON_TO_GOLD(IRON, GOLD), - GOLD_TO_DIAMOND(GOLD, DIAMOND), - COPPER_TO_IRON(COPPER, IRON), - DIAMOND_TO_CRYSTAL(DIAMOND, CRYSTAL), - WOOD_TO_IRON(WOOD, IRON), - WOOD_TO_COPPER(WOOD, COPPER), - DIAMOND_TO_OBSIDIAN(DIAMOND, OBSIDIAN); - - public final String name; - public final IronChestsTypes source; - public final IronChestsTypes target; - - IronChestsUpgradeType(IronChestsTypes source, IronChestsTypes target) { - this.name = Util.toEnglishName(this.name()); - this.source = source; - this.target = target; - } - - public boolean canUpgrade(IronChestsTypes from) { - return from == this.source; - } -} diff --git a/src/main/java/com/progwml6/ironchest/common/item/package-info.java b/src/main/java/com/progwml6/ironchest/common/item/package-info.java deleted file mode 100644 index 037c3d9..0000000 --- a/src/main/java/com/progwml6/ironchest/common/item/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.item; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/network/helper/package-info.java b/src/main/java/com/progwml6/ironchest/common/network/helper/package-info.java deleted file mode 100644 index 4aa5f07..0000000 --- a/src/main/java/com/progwml6/ironchest/common/network/helper/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.network.helper; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/network/package-info.java b/src/main/java/com/progwml6/ironchest/common/network/package-info.java deleted file mode 100644 index 0c75c7e..0000000 --- a/src/main/java/com/progwml6/ironchest/common/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.network; - -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/IronChests.java b/src/main/java/dev/ubujira/ironbarrels/IronChests.java similarity index 66% rename from src/main/java/com/progwml6/ironchest/IronChests.java rename to src/main/java/dev/ubujira/ironbarrels/IronChests.java index d1c8736..b9530b8 100644 --- a/src/main/java/com/progwml6/ironchest/IronChests.java +++ b/src/main/java/dev/ubujira/ironbarrels/IronChests.java @@ -1,13 +1,13 @@ -package com.progwml6.ironchest; +package dev.ubujira.ironbarrels; -import com.progwml6.ironchest.client.screen.IronChestScreen; -import com.progwml6.ironchest.client.render.IronChestRenderer; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.data.IronChestsRecipeProvider; -import com.progwml6.ironchest.common.inventory.IronChestsContainerTypes; -import com.progwml6.ironchest.common.item.IronChestsItems; -import com.progwml6.ironchest.common.network.IronChestNetwork; +import dev.ubujira.ironbarrels.client.render.IronChestRenderer; +import dev.ubujira.ironbarrels.client.screen.IronChestScreen; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.data.IronChestsRecipeProvider; +import dev.ubujira.ironbarrels.common.inventory.IronChestsContainerTypes; +import dev.ubujira.ironbarrels.common.item.IronChestsItems; +import dev.ubujira.ironbarrels.common.network.IronChestNetwork; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.data.DataGenerator; @@ -26,9 +26,9 @@ import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; @Mod(IronChests.MOD_ID) public class IronChests { - public static final String MOD_ID = "ironchest"; + public static final String MOD_ID = "ironbarrels"; - public static final CreativeModeTab IRONCHESTS_ITEM_GROUP = (new CreativeModeTab("ironchest") { + public static final CreativeModeTab IRONCHESTS_ITEM_GROUP = (new CreativeModeTab("ironbarrels") { @Override @OnlyIn(Dist.CLIENT) public ItemStack makeIcon() { @@ -65,7 +65,6 @@ public class IronChests { MenuScreens.register(IronChestsContainerTypes.CRYSTAL_CHEST.get(), IronChestScreen::new); MenuScreens.register(IronChestsContainerTypes.COPPER_CHEST.get(), IronChestScreen::new); MenuScreens.register(IronChestsContainerTypes.OBSIDIAN_CHEST.get(), IronChestScreen::new); - MenuScreens.register(IronChestsContainerTypes.DIRT_CHEST.get(), IronChestScreen::new); BlockEntityRenderers.register(IronChestsBlockEntityTypes.IRON_CHEST.get(), IronChestRenderer::new); BlockEntityRenderers.register(IronChestsBlockEntityTypes.GOLD_CHEST.get(), IronChestRenderer::new); @@ -73,15 +72,6 @@ public class IronChests { BlockEntityRenderers.register(IronChestsBlockEntityTypes.COPPER_CHEST.get(), IronChestRenderer::new); BlockEntityRenderers.register(IronChestsBlockEntityTypes.CRYSTAL_CHEST.get(), IronChestRenderer::new); BlockEntityRenderers.register(IronChestsBlockEntityTypes.OBSIDIAN_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.DIRT_CHEST.get(), IronChestRenderer::new); - - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_IRON_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_GOLD_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_DIAMOND_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_COPPER_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_CRYSTAL_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_OBSIDIAN_CHEST.get(), IronChestRenderer::new); - BlockEntityRenderers.register(IronChestsBlockEntityTypes.TRAPPED_DIRT_CHEST.get(), IronChestRenderer::new); } private void setup(final FMLCommonSetupEvent event) { diff --git a/src/main/java/com/progwml6/ironchest/IronChestsClientEvents.java b/src/main/java/dev/ubujira/ironbarrels/IronChestsClientEvents.java similarity index 89% rename from src/main/java/com/progwml6/ironchest/IronChestsClientEvents.java rename to src/main/java/dev/ubujira/ironbarrels/IronChestsClientEvents.java index 86ce645..a83140b 100644 --- a/src/main/java/com/progwml6/ironchest/IronChestsClientEvents.java +++ b/src/main/java/dev/ubujira/ironbarrels/IronChestsClientEvents.java @@ -1,6 +1,6 @@ -package com.progwml6.ironchest; +package dev.ubujira.ironbarrels; -import com.progwml6.ironchest.client.render.IronChestRenderer; +import dev.ubujira.ironbarrels.client.render.IronChestRenderer; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/dev/ubujira/ironbarrels/client/model/IronChestsModels.java b/src/main/java/dev/ubujira/ironbarrels/client/model/IronChestsModels.java new file mode 100644 index 0000000..7ca17b6 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/client/model/IronChestsModels.java @@ -0,0 +1,48 @@ +package dev.ubujira.ironbarrels.client.model; + +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import net.minecraft.client.renderer.Sheets; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = IronChests.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) +public class IronChestsModels { + + public static final ResourceLocation IRON_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/iron_chest"); + public static final ResourceLocation GOLD_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/gold_chest"); + public static final ResourceLocation DIAMOND_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/diamond_chest"); + public static final ResourceLocation COPPER_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/copper_chest"); + public static final ResourceLocation CRYSTAL_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/crystal_chest"); + public static final ResourceLocation OBSIDIAN_CHEST_LOCATION = new ResourceLocation(IronChests.MOD_ID, "model/obsidian_chest"); + public static final ResourceLocation VANILLA_CHEST_LOCATION = new ResourceLocation("entity/chest/normal"); + + public static ResourceLocation chooseChestTexture(IronChestsTypes type) { + return switch (type) { + case IRON -> IRON_CHEST_LOCATION; + case GOLD -> GOLD_CHEST_LOCATION; + case DIAMOND -> DIAMOND_CHEST_LOCATION; + case COPPER -> COPPER_CHEST_LOCATION; + case CRYSTAL -> CRYSTAL_CHEST_LOCATION; + case OBSIDIAN -> OBSIDIAN_CHEST_LOCATION; + default -> VANILLA_CHEST_LOCATION; + }; + } + + @SubscribeEvent + public static void onStitch(TextureStitchEvent.Pre event) { + if (!event.getAtlas().location().equals(Sheets.CHEST_SHEET)) { + return; + } + + event.addSprite(IRON_CHEST_LOCATION); + event.addSprite(GOLD_CHEST_LOCATION); + event.addSprite(DIAMOND_CHEST_LOCATION); + event.addSprite(COPPER_CHEST_LOCATION); + event.addSprite(CRYSTAL_CHEST_LOCATION); + event.addSprite(OBSIDIAN_CHEST_LOCATION); + } +} diff --git a/src/main/java/com/progwml6/ironchest/client/model/inventory/IronChestItemStackRenderer.java b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/IronChestItemStackRenderer.java similarity index 96% rename from src/main/java/com/progwml6/ironchest/client/model/inventory/IronChestItemStackRenderer.java rename to src/main/java/dev/ubujira/ironbarrels/client/model/inventory/IronChestItemStackRenderer.java index bdcd5a7..8b83e7a 100644 --- a/src/main/java/com/progwml6/ironchest/client/model/inventory/IronChestItemStackRenderer.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/IronChestItemStackRenderer.java @@ -1,10 +1,10 @@ -package com.progwml6.ironchest.client.model.inventory; +package dev.ubujira.ironbarrels.client.model.inventory; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.model.geom.EntityModelSet; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/progwml6/ironchest/client/model/inventory/ModelItem.java b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/ModelItem.java similarity index 95% rename from src/main/java/com/progwml6/ironchest/client/model/inventory/ModelItem.java rename to src/main/java/dev/ubujira/ironbarrels/client/model/inventory/ModelItem.java index e676db0..dd16a5e 100644 --- a/src/main/java/com/progwml6/ironchest/client/model/inventory/ModelItem.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/ModelItem.java @@ -1,4 +1,4 @@ -package com.progwml6.ironchest.client.model.inventory; +package dev.ubujira.ironbarrels.client.model.inventory; import com.mojang.math.Vector3f; diff --git a/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/package-info.java b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/package-info.java new file mode 100644 index 0000000..0ee7aa2 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/client/model/inventory/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.client.model.inventory; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/client/screen/package-info.java b/src/main/java/dev/ubujira/ironbarrels/client/model/package-info.java similarity index 78% rename from src/main/java/com/progwml6/ironchest/client/screen/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/client/model/package-info.java index 7df1434..df3fb98 100644 --- a/src/main/java/com/progwml6/ironchest/client/screen/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/model/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.client.screen; +package dev.ubujira.ironbarrels.client.model; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/package-info.java b/src/main/java/dev/ubujira/ironbarrels/client/package-info.java similarity index 81% rename from src/main/java/com/progwml6/ironchest/common/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/client/package-info.java index 1ed6007..43621f8 100644 --- a/src/main/java/com/progwml6/ironchest/common/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common; +package dev.ubujira.ironbarrels.client; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/client/render/IronChestRenderer.java b/src/main/java/dev/ubujira/ironbarrels/client/render/IronChestRenderer.java similarity index 85% rename from src/main/java/com/progwml6/ironchest/client/render/IronChestRenderer.java rename to src/main/java/dev/ubujira/ironbarrels/client/render/IronChestRenderer.java index 126ca4e..5139990 100644 --- a/src/main/java/com/progwml6/ironchest/client/render/IronChestRenderer.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/render/IronChestRenderer.java @@ -1,44 +1,41 @@ -package com.progwml6.ironchest.client.render; +package dev.ubujira.ironbarrels.client.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.progwml6.ironchest.IronChestsClientEvents; -import com.progwml6.ironchest.client.model.IronChestsModels; -import com.progwml6.ironchest.client.model.inventory.ModelItem; -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.ICrystalChest; -import com.progwml6.ironchest.common.block.trapped.entity.AbstractTrappedIronChestBlockEntity; -import it.unimi.dsi.fastutil.floats.Float2FloatFunction; -import it.unimi.dsi.fastutil.ints.Int2IntFunction; +import com.mojang.math.Vector3f; +import dev.ubujira.ironbarrels.IronChestsClientEvents; +import dev.ubujira.ironbarrels.client.model.IronChestsModels; +import dev.ubujira.ironbarrels.client.model.inventory.ModelItem; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.ICrystalChest; +import dev.ubujira.ironbarrels.common.block.regular.AbstractIronChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.entity.AbstractIronChestBlockEntity; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.CubeListBuilder; import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraft.client.model.geom.builders.MeshDefinition; import net.minecraft.client.model.geom.builders.PartDefinition; -import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; -import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Sheets; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.model.geom.ModelPart; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.renderer.blockentity.BrightnessCombiner; +import net.minecraft.client.renderer.Sheets; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.LidBlockEntity; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.DoubleBlockCombiner; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.client.renderer.blockentity.BrightnessCombiner; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.resources.model.Material; import net.minecraft.core.Direction; -import net.minecraft.world.phys.Vec3; -import com.mojang.math.Vector3f; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.DoubleBlockCombiner; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.LidBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -93,7 +90,7 @@ public class IronChestRenderer implement Level level = tileEntity.getLevel(); boolean useTileEntityBlockState = level != null; - BlockState blockState = useTileEntityBlockState ? tileEntity.getBlockState() : (BlockState) tileEntity.getBlockToUse().defaultBlockState().setValue(AbstractIronChestBlock.FACING, Direction.SOUTH); + BlockState blockState = useTileEntityBlockState ? tileEntity.getBlockState() : tileEntity.getBlockToUse().defaultBlockState().setValue(AbstractIronChestBlock.FACING, Direction.SOUTH); Block block = blockState.getBlock(); IronChestsTypes chestType = IronChestsTypes.IRON; IronChestsTypes actualType = AbstractIronChestBlock.getTypeFromBlock(block); @@ -119,15 +116,13 @@ public class IronChestRenderer implement neighborCombineResult = DoubleBlockCombiner.Combiner::acceptNone; } - float openness = neighborCombineResult.apply(AbstractIronChestBlock.opennessCombiner(tileEntity)).get(partialTicks); + float openness = neighborCombineResult.apply(AbstractIronChestBlock.opennessCombiner(tileEntity)).get(partialTicks); openness = 1.0F - openness; openness = 1.0F - openness * openness * openness; - int brightness = neighborCombineResult.apply(new BrightnessCombiner<>()).applyAsInt(combinedLightIn); + int brightness = neighborCombineResult.apply(new BrightnessCombiner<>()).applyAsInt(combinedLightIn); - boolean trapped = tileEntityIn instanceof AbstractTrappedIronChestBlockEntity; - - Material material = new Material(Sheets.CHEST_SHEET, IronChestsModels.chooseChestTexture(chestType, trapped)); + Material material = new Material(Sheets.CHEST_SHEET, IronChestsModels.chooseChestTexture(chestType)); VertexConsumer vertexConsumer = material.buffer(bufferSource, RenderType::entityCutout); diff --git a/src/main/java/dev/ubujira/ironbarrels/client/render/package-info.java b/src/main/java/dev/ubujira/ironbarrels/client/render/package-info.java new file mode 100644 index 0000000..1660025 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/client/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.client.render; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/client/screen/IronChestScreen.java b/src/main/java/dev/ubujira/ironbarrels/client/screen/IronChestScreen.java similarity index 92% rename from src/main/java/com/progwml6/ironchest/client/screen/IronChestScreen.java rename to src/main/java/dev/ubujira/ironbarrels/client/screen/IronChestScreen.java index b3e6c51..11dad91 100644 --- a/src/main/java/com/progwml6/ironchest/client/screen/IronChestScreen.java +++ b/src/main/java/dev/ubujira/ironbarrels/client/screen/IronChestScreen.java @@ -1,14 +1,14 @@ -package com.progwml6.ironchest.client.screen; +package dev.ubujira.ironbarrels.client.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; -import net.minecraft.client.gui.screens.inventory.MenuAccess; +import com.mojang.blaze3d.vertex.PoseStack; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.gui.screens.inventory.MenuAccess; import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/dev/ubujira/ironbarrels/client/screen/package-info.java b/src/main/java/dev/ubujira/ironbarrels/client/screen/package-info.java new file mode 100644 index 0000000..04e1122 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/client/screen/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.client.screen; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/Util.java b/src/main/java/dev/ubujira/ironbarrels/common/Util.java similarity index 90% rename from src/main/java/com/progwml6/ironchest/common/Util.java rename to src/main/java/dev/ubujira/ironbarrels/common/Util.java index 708beca..5e4f188 100644 --- a/src/main/java/com/progwml6/ironchest/common/Util.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/Util.java @@ -1,4 +1,4 @@ -package com.progwml6.ironchest.common; +package dev.ubujira.ironbarrels.common; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsBlocks.java b/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsBlocks.java new file mode 100644 index 0000000..8732c7a --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsBlocks.java @@ -0,0 +1,72 @@ +package dev.ubujira.ironbarrels.common.block; + +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.block.regular.CopperChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.CrystalChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.DiamondChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.GoldChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.IronChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.ObsidianChestBlock; +import dev.ubujira.ironbarrels.common.item.IronChestBlockItem; +import dev.ubujira.ironbarrels.common.item.IronChestsItems; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Material; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +import java.util.concurrent.Callable; +import java.util.function.Function; +import java.util.function.Supplier; + +public class IronChestsBlocks { + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, IronChests.MOD_ID); + public static final DeferredRegister ITEMS = IronChestsItems.ITEMS; + + public static final RegistryObject IRON_CHEST = register( + "iron_chest", () -> new IronChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.IRON); + + public static final RegistryObject GOLD_CHEST = register( + "gold_chest", () -> new GoldChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.GOLD); + + public static final RegistryObject DIAMOND_CHEST = register( + "diamond_chest", () -> new DiamondChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.DIAMOND); + + public static final RegistryObject COPPER_CHEST = register( + "copper_chest", () -> new CopperChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.COPPER); + + public static final RegistryObject CRYSTAL_CHEST = register( + "crystal_chest", () -> new CrystalChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.CRYSTAL); + + public static final RegistryObject OBSIDIAN_CHEST = register( + "obsidian_chest", () -> new ObsidianChestBlock(Block.Properties.of(Material.METAL).strength(3.0F)), + IronChestsTypes.OBSIDIAN); + + //HELPERS + + private static RegistryObject register(String name, Supplier sup, IronChestsTypes chestType) { + return register(name, sup, block -> item(block, () -> () -> chestType)); + } + + private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) { + RegistryObject ret = registerNoItem(name, sup); + ITEMS.register(name, itemCreator.apply(ret)); + return ret; + } + + private static RegistryObject registerNoItem(String name, Supplier sup) { + return BLOCKS.register(name, sup); + } + + private static Supplier item(final RegistryObject block, Supplier> chestType) { + return () -> new IronChestBlockItem(block.get(), new Item.Properties().tab(IronChests.IRONCHESTS_ITEM_GROUP), chestType); + } +} diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsTypes.java b/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsTypes.java new file mode 100644 index 0000000..f867eed --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/IronChestsTypes.java @@ -0,0 +1,102 @@ +package dev.ubujira.ironbarrels.common.block; + +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.Util; +import dev.ubujira.ironbarrels.common.block.regular.entity.AbstractIronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.CopperChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.CrystalChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.DiamondChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.GoldChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.IronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.ObsidianChestBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.StringRepresentable; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Locale; + +public enum IronChestsTypes implements StringRepresentable { + + IRON(54, 9, 184, 222, new ResourceLocation(IronChests.MOD_ID, "textures/gui/iron_container.png"), 256, 256), + GOLD(81, 9, 184, 276, new ResourceLocation(IronChests.MOD_ID, "textures/gui/gold_container.png"), 256, 276), + DIAMOND(108, 12, 238, 276, new ResourceLocation(IronChests.MOD_ID, "textures/gui/diamond_container.png"), 256, 276), + COPPER(45, 9, 184, 204, new ResourceLocation(IronChests.MOD_ID, "textures/gui/copper_container.png"), 256, 256), + CRYSTAL(108, 12, 238, 276, new ResourceLocation(IronChests.MOD_ID, "textures/gui/diamond_container.png"), 256, 276), + OBSIDIAN(108, 12, 238, 276, new ResourceLocation(IronChests.MOD_ID, "textures/gui/diamond_container.png"), 256, 276), + WOOD(0, 0, 0, 0, null, 0, 0); + + private final String name; + public final int size; + public final int rowLength; + public final int xSize; + public final int ySize; + public final ResourceLocation guiTexture; + public final int textureXSize; + public final int textureYSize; + + IronChestsTypes(int size, int rowLength, int xSize, int ySize, ResourceLocation guiTexture, int textureXSize, int textureYSize) { + this(null, size, rowLength, xSize, ySize, guiTexture, textureXSize, textureYSize); + } + + IronChestsTypes(@Nullable String name, int size, int rowLength, int xSize, int ySize, ResourceLocation guiTexture, int textureXSize, int textureYSize) { + this.name = name == null ? Util.toEnglishName(this.name()) : name; + this.size = size; + this.rowLength = rowLength; + this.xSize = xSize; + this.ySize = ySize; + this.guiTexture = guiTexture; + this.textureXSize = textureXSize; + this.textureYSize = textureYSize; + } + + public String getId() { + return this.name().toLowerCase(Locale.ROOT); + } + + public String getEnglishName() { + return this.name; + } + + @Override + public String getSerializedName() { + return this.getEnglishName(); + } + + public int getRowCount() { + return this.size / this.rowLength; + } + + public boolean isTransparent() { + return this == CRYSTAL; + } + + public static List get(IronChestsTypes type) { + return switch (type) { + case IRON -> List.of(IronChestsBlocks.IRON_CHEST.get()); + case GOLD -> List.of(IronChestsBlocks.GOLD_CHEST.get()); + case DIAMOND -> List.of(IronChestsBlocks.DIAMOND_CHEST.get()); + case COPPER -> List.of(IronChestsBlocks.COPPER_CHEST.get()); + case CRYSTAL -> List.of(IronChestsBlocks.CRYSTAL_CHEST.get()); + case OBSIDIAN -> List.of(IronChestsBlocks.OBSIDIAN_CHEST.get()); + default -> List.of(Blocks.CHEST); + }; + } + + @Nullable + public AbstractIronChestBlockEntity makeEntity(BlockPos blockPos, BlockState blockState) { + return switch (this) { + case IRON -> new IronChestBlockEntity(blockPos, blockState); + case GOLD -> new GoldChestBlockEntity(blockPos, blockState); + case DIAMOND -> new DiamondChestBlockEntity(blockPos, blockState); + case COPPER -> new CopperChestBlockEntity(blockPos, blockState); + case CRYSTAL -> new CrystalChestBlockEntity(blockPos, blockState); + case OBSIDIAN -> new ObsidianChestBlockEntity(blockPos, blockState); + default -> null; + }; + } +} diff --git a/src/main/java/com/progwml6/ironchest/common/block/entity/ICrystalChest.java b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/ICrystalChest.java similarity index 94% rename from src/main/java/com/progwml6/ironchest/common/block/entity/ICrystalChest.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/entity/ICrystalChest.java index c78df58..199b43e 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/entity/ICrystalChest.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/ICrystalChest.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.entity; +package dev.ubujira.ironbarrels.common.block.entity; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.network.InventoryTopStacksSyncPacket; -import com.progwml6.ironchest.common.network.IronChestNetwork; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.network.InventoryTopStacksSyncPacket; +import dev.ubujira.ironbarrels.common.network.IronChestNetwork; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/entity/IronChestsBlockEntityTypes.java b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/IronChestsBlockEntityTypes.java new file mode 100644 index 0000000..bb3b5d2 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/IronChestsBlockEntityTypes.java @@ -0,0 +1,38 @@ +package dev.ubujira.ironbarrels.common.block.entity; + +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.regular.entity.CopperChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.CrystalChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.DiamondChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.GoldChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.IronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.ObsidianChestBlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class IronChestsBlockEntityTypes { + + public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, IronChests.MOD_ID); + + public static final RegistryObject> IRON_CHEST = BLOCK_ENTITIES.register( + "iron_chest", () -> BlockEntityType.Builder.of(IronChestBlockEntity::new, IronChestsBlocks.IRON_CHEST.get()).build(null)); + + public static final RegistryObject> GOLD_CHEST = BLOCK_ENTITIES.register( + "gold_chest", () -> BlockEntityType.Builder.of(GoldChestBlockEntity::new, IronChestsBlocks.GOLD_CHEST.get()).build(null)); + + public static final RegistryObject> DIAMOND_CHEST = BLOCK_ENTITIES.register( + "diamond_chest", () -> BlockEntityType.Builder.of(DiamondChestBlockEntity::new, IronChestsBlocks.DIAMOND_CHEST.get()).build(null)); + + public static final RegistryObject> COPPER_CHEST = BLOCK_ENTITIES.register( + "copper_chest", () -> BlockEntityType.Builder.of(CopperChestBlockEntity::new, IronChestsBlocks.COPPER_CHEST.get()).build(null)); + + public static final RegistryObject> CRYSTAL_CHEST = BLOCK_ENTITIES.register( + "crystal_chest", () -> BlockEntityType.Builder.of(CrystalChestBlockEntity::new, IronChestsBlocks.CRYSTAL_CHEST.get()).build(null)); + + public static final RegistryObject> OBSIDIAN_CHEST = BLOCK_ENTITIES.register( + "obsidian_chest", () -> BlockEntityType.Builder.of(ObsidianChestBlockEntity::new, IronChestsBlocks.OBSIDIAN_CHEST.get()).build(null)); + +} diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/entity/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/package-info.java new file mode 100644 index 0000000..b5d0602 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/entity/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.common.block.entity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/client/render/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/block/package-info.java similarity index 78% rename from src/main/java/com/progwml6/ironchest/client/render/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/package-info.java index 68b255f..9757fca 100644 --- a/src/main/java/com/progwml6/ironchest/client/render/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.client.render; +package dev.ubujira.ironbarrels.common.block; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/AbstractIronChestBlock.java similarity index 94% rename from src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/AbstractIronChestBlock.java index 61f6b10..bc8f06b 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/AbstractIronChestBlock.java @@ -1,7 +1,7 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.AbstractIronChestBlockEntity; import it.unimi.dsi.fastutil.floats.Float2FloatFunction; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -210,16 +210,14 @@ public abstract class AbstractIronChestBlock extends BaseEntityBlock implements @Nullable public static Container getContainer(AbstractIronChestBlock chestBlock, BlockState blockState, Level level, BlockPos blockPos, boolean ignoreBlockedChest) { - return chestBlock.combine(blockState, level, blockPos, ignoreBlockedChest).>apply(CHEST_COMBINER).orElse((Container) null); + return chestBlock.combine(blockState, level, blockPos, ignoreBlockedChest).apply(CHEST_COMBINER).orElse(null); } public DoubleBlockCombiner.NeighborCombineResult combine(BlockState blockState, Level level, BlockPos blockPos, boolean ignoreBlockedChest) { BiPredicate biPredicate; if (ignoreBlockedChest) { - biPredicate = (levelAccessor, blockPos1) -> { - return false; - }; + biPredicate = (levelAccessor, blockPos1) -> false; } else { biPredicate = AbstractIronChestBlock::isChestBlockedAt; } @@ -229,7 +227,7 @@ public abstract class AbstractIronChestBlock extends BaseEntityBlock implements @Nullable public MenuProvider getMenuProvider(BlockState blockState, Level level, BlockPos blockPos) { - return this.combine(blockState, level, blockPos, false).>apply(MENU_PROVIDER_COMBINER).orElse((MenuProvider) null); + return this.combine(blockState, level, blockPos, false).apply(MENU_PROVIDER_COMBINER).orElse(null); } public static DoubleBlockCombiner.Combiner opennessCombiner(final LidBlockEntity lidBlockEntity) { @@ -265,7 +263,7 @@ public abstract class AbstractIronChestBlock extends BaseEntityBlock implements } private static boolean isCatSittingOnChest(LevelAccessor levelAccessor, BlockPos blockPos) { - List list = levelAccessor.getEntitiesOfClass(Cat.class, new AABB((double) blockPos.getX(), (double) (blockPos.getY() + 1), (double) blockPos.getZ(), (double) (blockPos.getX() + 1), (double) (blockPos.getY() + 2), (double) (blockPos.getZ() + 1))); + List list = levelAccessor.getEntitiesOfClass(Cat.class, new AABB(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ(), blockPos.getX() + 1, blockPos.getY() + 2, blockPos.getZ() + 1)); if (!list.isEmpty()) { for (Cat cat : list) { diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/CopperChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/CopperChestBlock.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/CopperChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/CopperChestBlock.java index 4803815..230fefc 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/CopperChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/CopperChestBlock.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.CopperChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.CopperChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/CrystalChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/CrystalChestBlock.java similarity index 75% rename from src/main/java/com/progwml6/ironchest/common/block/regular/CrystalChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/CrystalChestBlock.java index 37aa041..0dc1d7e 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/CrystalChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/CrystalChestBlock.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.regular.entity.CrystalChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.AbstractIronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.CrystalChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/DiamondChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/DiamondChestBlock.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/DiamondChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/DiamondChestBlock.java index d2d13ea..8ab43e2 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/DiamondChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/DiamondChestBlock.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.DiamondChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.DiamondChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/GoldChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/GoldChestBlock.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/GoldChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/GoldChestBlock.java index 0bae0a0..e9ce3b1 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/GoldChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/GoldChestBlock.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.GoldChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.GoldChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/IronChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/IronChestBlock.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/IronChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/IronChestBlock.java index b74e9b3..a871248 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/IronChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/IronChestBlock.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.IronChestBlockEntity; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.IronChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/ObsidianChestBlock.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/ObsidianChestBlock.java similarity index 70% rename from src/main/java/com/progwml6/ironchest/common/block/regular/ObsidianChestBlock.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/ObsidianChestBlock.java index 75abcf0..a1b3b3e 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/ObsidianChestBlock.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/ObsidianChestBlock.java @@ -1,8 +1,8 @@ -package com.progwml6.ironchest.common.block.regular; +package dev.ubujira.ironbarrels.common.block.regular; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.block.regular.entity.ObsidianChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.ObsidianChestBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/AbstractIronChestBlockEntity.java similarity index 91% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/AbstractIronChestBlockEntity.java index 0856aae..e89ce1d 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/AbstractIronChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.regular.AbstractIronChestBlock; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -68,7 +68,7 @@ public abstract class AbstractIronChestBlockEntity extends RandomizableContainer protected AbstractIronChestBlockEntity(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState, IronChestsTypes chestTypeIn, Supplier blockToUseIn) { super(blockEntityType, blockPos, blockState); - this.items = NonNullList.withSize(chestTypeIn.size, ItemStack.EMPTY); + this.items = NonNullList.withSize(chestTypeIn.size, ItemStack.EMPTY); this.chestType = chestTypeIn; this.blockToUse = blockToUseIn; } @@ -112,7 +112,7 @@ public abstract class AbstractIronChestBlockEntity extends RandomizableContainer double d1 = (double) blockPos.getY() + 0.5D; double d2 = (double) blockPos.getZ() + 0.5D; - level.playSound((Player) null, d0, d1, d2, soundEvent, SoundSource.BLOCKS, 0.5F, level.random.nextFloat() * 0.1F + 0.9F); + level.playSound(null, d0, d1, d2, soundEvent, SoundSource.BLOCKS, 0.5F, level.random.nextFloat() * 0.1F + 0.9F); } @Override @@ -146,7 +146,7 @@ public abstract class AbstractIronChestBlockEntity extends RandomizableContainer @Override public void setItems(NonNullList itemsIn) { - this.items = NonNullList.withSize(this.getChestType().size, ItemStack.EMPTY); + this.items = NonNullList.withSize(this.getChestType().size, ItemStack.EMPTY); for (int i = 0; i < itemsIn.size(); i++) { if (i < this.items.size()) { diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/CopperChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CopperChestBlockEntity.java similarity index 68% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/CopperChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CopperChestBlockEntity.java index e36b71c..937a458 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/CopperChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CopperChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/CrystalChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CrystalChestBlockEntity.java similarity index 85% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/CrystalChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CrystalChestBlockEntity.java index 6ce9a97..09e436a 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/CrystalChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/CrystalChestBlockEntity.java @@ -1,10 +1,10 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.ICrystalChest; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.ICrystalChest; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.world.entity.player.Inventory; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DiamondChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/DiamondChestBlockEntity.java similarity index 68% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/DiamondChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/DiamondChestBlockEntity.java index 16af11d..3f460d7 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DiamondChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/DiamondChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/GoldChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/GoldChestBlockEntity.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/GoldChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/GoldChestBlockEntity.java index c28c6ac..165e425 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/GoldChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/GoldChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/IronChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/IronChestBlockEntity.java similarity index 67% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/IronChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/IronChestBlockEntity.java index d238b5b..c2bea2f 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/IronChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/IronChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/ObsidianChestBlockEntity.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/ObsidianChestBlockEntity.java similarity index 68% rename from src/main/java/com/progwml6/ironchest/common/block/regular/entity/ObsidianChestBlockEntity.java rename to src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/ObsidianChestBlockEntity.java index a89a529..24d09ed 100644 --- a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/ObsidianChestBlockEntity.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/ObsidianChestBlockEntity.java @@ -1,9 +1,9 @@ -package com.progwml6.ironchest.common.block.regular.entity; +package dev.ubujira.ironbarrels.common.block.regular.entity; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes; -import com.progwml6.ironchest.common.inventory.IronChestMenu; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.entity.IronChestsBlockEntityTypes; +import dev.ubujira.ironbarrels.common.inventory.IronChestMenu; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/package-info.java new file mode 100644 index 0000000..80750bc --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/entity/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.common.block.regular.entity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/block/regular/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/package-info.java new file mode 100644 index 0000000..395a2a3 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/block/regular/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.common.block.regular; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java b/src/main/java/dev/ubujira/ironbarrels/common/data/IronChestsRecipeProvider.java similarity index 75% rename from src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java rename to src/main/java/dev/ubujira/ironbarrels/common/data/IronChestsRecipeProvider.java index 65d0d44..8de1a5b 100644 --- a/src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/data/IronChestsRecipeProvider.java @@ -1,24 +1,22 @@ -package com.progwml6.ironchest.common.data; +package dev.ubujira.ironbarrels.common.data; -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.item.IronChestsItems; -import com.progwml6.ironchest.common.item.IronChestsUpgradeType; +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.item.IronChestsItems; +import dev.ubujira.ironbarrels.common.item.IronChestsUpgradeType; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.RequirementsStrategy; import net.minecraft.advancements.critereon.RecipeUnlockedTrigger; -import net.minecraft.data.recipes.ShapelessRecipeBuilder; -import net.minecraft.world.level.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.level.ItemLike; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; import net.minecraftforge.common.crafting.ConditionalAdvancement; import net.minecraftforge.common.crafting.ConditionalRecipe; @@ -91,57 +89,6 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi .unlockedBy("has_glass", has(Tags.Items.GLASS)) .save(consumer, location(folder + "diamond_crystal_chest")); - ShapedRecipeBuilder.shaped(IronChestsBlocks.DIRT_CHEST.get()) - .define('M', Ingredient.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL)) - .define('S', Tags.Items.CHESTS_WOODEN) - .pattern("MMM") - .pattern("MSM") - .pattern("MMM") - .unlockedBy("has_iron_ingot", has(Blocks.DIRT)) - .save(consumer, location(folder + "vanilla_dirt_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_IRON_CHEST.get()) - .requires(IronChestsBlocks.IRON_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_iron_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_GOLD_CHEST.get()) - .requires(IronChestsBlocks.GOLD_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_gold_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_DIAMOND_CHEST.get()) - .requires(IronChestsBlocks.DIAMOND_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_diamond_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_COPPER_CHEST.get()) - .requires(IronChestsBlocks.COPPER_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_copper_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_CRYSTAL_CHEST.get()) - .requires(IronChestsBlocks.CRYSTAL_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_crystal_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_OBSIDIAN_CHEST.get()) - .requires(IronChestsBlocks.OBSIDIAN_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_obsidian_chest")); - - ShapelessRecipeBuilder.shapeless(IronChestsBlocks.TRAPPED_DIRT_CHEST.get()) - .requires(IronChestsBlocks.DIRT_CHEST.get()) - .requires(Blocks.TRIPWIRE_HOOK) - .unlockedBy("has_tripwire_hook", has(Blocks.TRIPWIRE_HOOK)) - .save(consumer, location(folder + "trapped_dirt_chest")); - ResourceLocation copperToIronChest = location(folder + "copper_iron_chest"); ConditionalRecipe.builder() .addCondition(not(new TagEmptyCondition("forge:ingots/copper"))) @@ -153,7 +100,7 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi .pattern("GSG") .pattern("MGM") .unlockedBy("has_item", has(Tags.Items.INGOTS_IRON))::save) - .setAdvancement(location("recipes/ironchest/chests/copper_iron_chest"), ConditionalAdvancement.builder() + .setAdvancement(location("recipes/ironbarrels/chests/copper_iron_chest"), ConditionalAdvancement.builder() .addCondition(not(new TagEmptyCondition("forge:ingots/copper"))) .addAdvancement(Advancement.Builder.advancement() .parent(new ResourceLocation("recipes/root")) @@ -173,7 +120,7 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi .pattern("MSM") .pattern("MMM") .unlockedBy("has_item", has(INGOTS_COPPER))::save) - .setAdvancement(location("recipes/ironchest/chests/vanilla_copper_chest"), ConditionalAdvancement.builder() + .setAdvancement(location("recipes/ironbarrels/chests/vanilla_copper_chest"), ConditionalAdvancement.builder() .addCondition(not(new TagEmptyCondition("forge:ingots/copper"))) .addAdvancement(Advancement.Builder.advancement() .parent(new ResourceLocation("recipes/root")) @@ -243,7 +190,7 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi .pattern("MSM") .pattern("MMM") .unlockedBy("has_item", has(ItemTags.PLANKS))::save) - .setAdvancement(location("recipes/ironchest/upgrades/wood_to_copper_chest_upgrade"), ConditionalAdvancement.builder() + .setAdvancement(location("recipes/ironbarrels/upgrades/wood_to_copper_chest_upgrade"), ConditionalAdvancement.builder() .addCondition(not(new TagEmptyCondition("forge:ingots/copper"))) .addAdvancement(Advancement.Builder.advancement() .parent(new ResourceLocation("recipes/root")) @@ -264,7 +211,7 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi .pattern("GSG") .pattern("MGM") .unlockedBy("has_item", has(ItemTags.PLANKS))::save) - .setAdvancement(location("recipes/ironchest/upgrades/copper_to_iron_chest_upgrade"), ConditionalAdvancement.builder() + .setAdvancement(location("recipes/ironbarrels/upgrades/copper_to_iron_chest_upgrade"), ConditionalAdvancement.builder() .addCondition(not(new TagEmptyCondition("forge:ingots/copper"))) .addAdvancement(Advancement.Builder.advancement() .parent(new ResourceLocation("recipes/root")) diff --git a/src/main/java/com/progwml6/ironchest/common/ai/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/data/package-info.java similarity index 79% rename from src/main/java/com/progwml6/ironchest/common/ai/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/common/data/package-info.java index caafd4a..eb36067 100644 --- a/src/main/java/com/progwml6/ironchest/common/ai/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/data/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.common.ai; +package dev.ubujira.ironbarrels.common.data; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestMenu.java b/src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestMenu.java similarity index 85% rename from src/main/java/com/progwml6/ironchest/common/inventory/IronChestMenu.java rename to src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestMenu.java index be42227..fc40078 100644 --- a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestMenu.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestMenu.java @@ -1,6 +1,6 @@ -package com.progwml6.ironchest.common.inventory; +package dev.ubujira.ironbarrels.common.inventory; -import com.progwml6.ironchest.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.player.Inventory; @@ -72,14 +72,6 @@ public class IronChestMenu extends AbstractContainerMenu { return new IronChestMenu(IronChestsContainerTypes.OBSIDIAN_CHEST.get(), containerId, playerInventory, inventory, IronChestsTypes.OBSIDIAN); } - public static IronChestMenu createDirtContainer(int containerId, Inventory playerInventory) { - return new IronChestMenu(IronChestsContainerTypes.DIRT_CHEST.get(), containerId, playerInventory, new SimpleContainer(IronChestsTypes.DIRT.size), IronChestsTypes.DIRT); - } - - public static IronChestMenu createDirtContainer(int containerId, Inventory playerInventory, Container inventory) { - return new IronChestMenu(IronChestsContainerTypes.DIRT_CHEST.get(), containerId, playerInventory, inventory, IronChestsTypes.DIRT); - } - protected IronChestMenu(@Nullable MenuType menuType, int containerId, Inventory playerInventory, Container inventory, IronChestsTypes chestType) { super(menuType, containerId); @@ -90,13 +82,9 @@ public class IronChestMenu extends AbstractContainerMenu { inventory.startOpen(playerInventory.player); - if (chestType == IronChestsTypes.DIRT) { - this.addSlot(new DirtChestSlot(inventory, 0, 12 + 4 * 18, 8 + 2 * 18)); - } else { - for (int chestRow = 0; chestRow < chestType.getRowCount(); chestRow++) { - for (int chestCol = 0; chestCol < chestType.rowLength; chestCol++) { - this.addSlot(new Slot(inventory, chestCol + chestRow * chestType.rowLength, 12 + chestCol * 18, 18 + chestRow * 18)); - } + for (int chestRow = 0; chestRow < chestType.getRowCount(); chestRow++) { + for (int chestCol = 0; chestCol < chestType.rowLength; chestCol++) { + this.addSlot(new Slot(inventory, chestCol + chestRow * chestType.rowLength, 12 + chestCol * 18, 18 + chestRow * 18)); } } diff --git a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java b/src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestsContainerTypes.java similarity index 84% rename from src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java rename to src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestsContainerTypes.java index 02185c1..4e39059 100644 --- a/src/main/java/com/progwml6/ironchest/common/inventory/IronChestsContainerTypes.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/inventory/IronChestsContainerTypes.java @@ -1,10 +1,10 @@ -package com.progwml6.ironchest.common.inventory; +package dev.ubujira.ironbarrels.common.inventory; -import com.progwml6.ironchest.IronChests; +import dev.ubujira.ironbarrels.IronChests; import net.minecraft.world.inventory.MenuType; -import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; public class IronChestsContainerTypes { @@ -22,5 +22,4 @@ public class IronChestsContainerTypes { public static final RegistryObject> OBSIDIAN_CHEST = CONTAINERS.register("obsidian_chest", () -> new MenuType<>(IronChestMenu::createObsidianContainer)); - public static final RegistryObject> DIRT_CHEST = CONTAINERS.register("dirt_chest", () -> new MenuType<>(IronChestMenu::createDirtContainer)); } diff --git a/src/main/java/dev/ubujira/ironbarrels/common/inventory/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/inventory/package-info.java new file mode 100644 index 0000000..0f4d97a --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/inventory/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.common.inventory; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/item/ChestUpgradeItem.java b/src/main/java/dev/ubujira/ironbarrels/common/item/ChestUpgradeItem.java similarity index 80% rename from src/main/java/com/progwml6/ironchest/common/item/ChestUpgradeItem.java rename to src/main/java/dev/ubujira/ironbarrels/common/item/ChestUpgradeItem.java index 48e73f4..ea9f4d4 100644 --- a/src/main/java/com/progwml6/ironchest/common/item/ChestUpgradeItem.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/item/ChestUpgradeItem.java @@ -1,26 +1,24 @@ -package com.progwml6.ironchest.common.item; +package dev.ubujira.ironbarrels.common.item; -import com.progwml6.ironchest.common.block.IronChestsBlocks; -import com.progwml6.ironchest.common.block.regular.AbstractIronChestBlock; -import com.progwml6.ironchest.common.block.IronChestsTypes; -import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity; -import com.progwml6.ironchest.common.block.trapped.entity.AbstractTrappedIronChestBlockEntity; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.TrappedChestBlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.ChestBlock; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.regular.AbstractIronChestBlock; +import dev.ubujira.ironbarrels.common.block.regular.entity.AbstractIronChestBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.NonNullList; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.block.entity.ChestBlockEntity; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.ChestBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.ChestBlockEntity; +import net.minecraft.world.level.block.state.BlockState; public class ChestUpgradeItem extends Item { @@ -89,20 +87,14 @@ public class ChestUpgradeItem extends Item { return InteractionResult.PASS; } - boolean trapped = tileEntity instanceof AbstractTrappedIronChestBlockEntity; - - if(trapped) { - iBlockState = IronChestsTypes.get(this.type.target).get(1).defaultBlockState(); - } else { - iBlockState = IronChestsTypes.get(this.type.target).get(0).defaultBlockState(); - } + iBlockState = IronChestsTypes.get(this.type.target).get(0).defaultBlockState(); chestContents = chest.getItems(); chestFacing = chestState.getValue(AbstractIronChestBlock.FACING); customName = chest.getCustomName(); iBlockState = iBlockState.setValue(AbstractIronChestBlock.FACING, chestFacing); - newChest = this.type.target.makeEntity(blockPos, iBlockState, trapped); + newChest = this.type.target.makeEntity(blockPos, iBlockState); } else if (tileEntity instanceof ChestBlockEntity chest) { BlockState chestState = world.getBlockState(blockPos); chestFacing = chestState.getValue(ChestBlock.FACING); @@ -127,17 +119,11 @@ public class ChestUpgradeItem extends Item { customName = chest.getCustomName(); - boolean trapped = tileEntity instanceof TrappedChestBlockEntity; - - if(trapped) { - iBlockState = IronChestsTypes.get(this.type.target).get(1).defaultBlockState(); - } else { - iBlockState = IronChestsTypes.get(this.type.target).get(0).defaultBlockState(); - } + iBlockState = IronChestsTypes.get(this.type.target).get(0).defaultBlockState(); iBlockState = iBlockState.setValue(AbstractIronChestBlock.FACING, chestFacing); - newChest = this.type.target.makeEntity(blockPos, iBlockState, trapped); + newChest = this.type.target.makeEntity(blockPos, iBlockState); } } diff --git a/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestBlockItem.java b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestBlockItem.java new file mode 100644 index 0000000..5442d03 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestBlockItem.java @@ -0,0 +1,60 @@ +package dev.ubujira.ironbarrels.common.item; + +import dev.ubujira.ironbarrels.client.model.inventory.IronChestItemStackRenderer; +import dev.ubujira.ironbarrels.common.block.IronChestsBlocks; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; +import dev.ubujira.ironbarrels.common.block.regular.entity.CopperChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.CrystalChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.DiamondChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.GoldChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.IronChestBlockEntity; +import dev.ubujira.ironbarrels.common.block.regular.entity.ObsidianChestBlockEntity; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.IItemRenderProperties; +import net.minecraftforge.fml.DistExecutor; + +import java.util.concurrent.Callable; +import java.util.function.Consumer; +import java.util.function.Supplier; + +public class IronChestBlockItem extends BlockItem { + + protected Supplier type; + + public IronChestBlockItem(Block block, Properties properties, Supplier> type) { + super(block, properties); + + IronChestsTypes tempType = DistExecutor.callWhenOn(Dist.CLIENT, type); + + this.type = tempType == null ? null : () -> tempType; + } + + @Override + public void initializeClient(Consumer consumer) { + super.initializeClient(consumer); + + consumer.accept(new IItemRenderProperties() { + @Override + public BlockEntityWithoutLevelRenderer getItemStackRenderer() { + Supplier modelToUse; + + switch (type.get()) { + case GOLD -> modelToUse = () -> new GoldChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.GOLD_CHEST.get().defaultBlockState()); + case DIAMOND -> modelToUse = () -> new DiamondChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.DIAMOND_CHEST.get().defaultBlockState()); + case COPPER -> modelToUse = () -> new CopperChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.COPPER_CHEST.get().defaultBlockState()); + case CRYSTAL -> modelToUse = () -> new CrystalChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.CRYSTAL_CHEST.get().defaultBlockState()); + case OBSIDIAN -> modelToUse = () -> new ObsidianChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.OBSIDIAN_CHEST.get().defaultBlockState()); + default -> modelToUse = () -> new IronChestBlockEntity(BlockPos.ZERO, IronChestsBlocks.IRON_CHEST.get().defaultBlockState()); + } + + return new IronChestItemStackRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels(), modelToUse); + } + }); + } +} diff --git a/src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsItems.java similarity index 92% rename from src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java rename to src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsItems.java index 5a5a5c8..4609f20 100644 --- a/src/main/java/com/progwml6/ironchest/common/item/IronChestsItems.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsItems.java @@ -1,11 +1,11 @@ -package com.progwml6.ironchest.common.item; +package dev.ubujira.ironbarrels.common.item; import com.google.common.collect.ImmutableMap; -import com.progwml6.ironchest.IronChests; +import dev.ubujira.ironbarrels.IronChests; import net.minecraft.world.item.Item; -import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; import java.util.Arrays; import java.util.Locale; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsUpgradeType.java b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsUpgradeType.java new file mode 100644 index 0000000..9705d20 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/item/IronChestsUpgradeType.java @@ -0,0 +1,37 @@ +package dev.ubujira.ironbarrels.common.item; + +import dev.ubujira.ironbarrels.common.Util; +import dev.ubujira.ironbarrels.common.block.IronChestsTypes; + +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.COPPER; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.CRYSTAL; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.DIAMOND; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.GOLD; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.IRON; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.OBSIDIAN; +import static dev.ubujira.ironbarrels.common.block.IronChestsTypes.WOOD; + +public enum IronChestsUpgradeType { + + IRON_TO_GOLD(IRON, GOLD), + GOLD_TO_DIAMOND(GOLD, DIAMOND), + COPPER_TO_IRON(COPPER, IRON), + DIAMOND_TO_CRYSTAL(DIAMOND, CRYSTAL), + WOOD_TO_IRON(WOOD, IRON), + WOOD_TO_COPPER(WOOD, COPPER), + DIAMOND_TO_OBSIDIAN(DIAMOND, OBSIDIAN); + + public final String name; + public final IronChestsTypes source; + public final IronChestsTypes target; + + IronChestsUpgradeType(IronChestsTypes source, IronChestsTypes target) { + this.name = Util.toEnglishName(this.name()); + this.source = source; + this.target = target; + } + + public boolean canUpgrade(IronChestsTypes from) { + return from == this.source; + } +} diff --git a/src/main/java/com/progwml6/ironchest/client/model/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/item/package-info.java similarity index 79% rename from src/main/java/com/progwml6/ironchest/client/model/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/common/item/package-info.java index 65ddbb9..552ae62 100644 --- a/src/main/java/com/progwml6/ironchest/client/model/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/item/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.client.model; +package dev.ubujira.ironbarrels.common.item; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java b/src/main/java/dev/ubujira/ironbarrels/common/network/InventoryTopStacksSyncPacket.java similarity index 87% rename from src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java rename to src/main/java/dev/ubujira/ironbarrels/common/network/InventoryTopStacksSyncPacket.java index 71d1a8f..8a9bb71 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/InventoryTopStacksSyncPacket.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/InventoryTopStacksSyncPacket.java @@ -1,14 +1,14 @@ -package com.progwml6.ironchest.common.network; +package dev.ubujira.ironbarrels.common.network; -import com.progwml6.ironchest.common.block.entity.ICrystalChest; -import com.progwml6.ironchest.common.network.helper.IThreadsafePacket; +import dev.ubujira.ironbarrels.common.block.entity.ICrystalChest; +import dev.ubujira.ironbarrels.common.network.helper.IThreadsafePacket; import net.minecraft.client.Minecraft; -import net.minecraft.world.item.ItemStack; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.core.NonNullList; import net.minecraft.core.BlockPos; +import net.minecraft.core.NonNullList; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.network.NetworkEvent; public class InventoryTopStacksSyncPacket implements IThreadsafePacket { @@ -23,7 +23,7 @@ public class InventoryTopStacksSyncPacket implements IThreadsafePacket { public InventoryTopStacksSyncPacket(FriendlyByteBuf buffer) { int size = buffer.readInt(); - NonNullList topStacks = NonNullList.withSize(size, ItemStack.EMPTY); + NonNullList topStacks = NonNullList.withSize(size, ItemStack.EMPTY); for (int item = 0; item < size; item++) { ItemStack itemStack = buffer.readItem(); diff --git a/src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java b/src/main/java/dev/ubujira/ironbarrels/common/network/IronChestNetwork.java similarity index 95% rename from src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java rename to src/main/java/dev/ubujira/ironbarrels/common/network/IronChestNetwork.java index 135653b..094fc0f 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/IronChestNetwork.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/IronChestNetwork.java @@ -1,17 +1,17 @@ -package com.progwml6.ironchest.common.network; +package dev.ubujira.ironbarrels.common.network; -import com.progwml6.ironchest.IronChests; -import com.progwml6.ironchest.common.network.helper.ISimplePacket; +import dev.ubujira.ironbarrels.IronChests; +import dev.ubujira.ironbarrels.common.network.helper.ISimplePacket; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.protocol.Packet; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraft.server.level.ServerLevel; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.NetworkEvent; @@ -53,7 +53,7 @@ public class IronChestNetwork { } /** - * Called during mod construction to setup the network + * Called during mod construction to set up the network */ public static void setup() { if (instance != null) { @@ -117,7 +117,7 @@ public class IronChestNetwork { * @param packet Packet */ public void sendVanillaPacket(Packet packet, Entity player) { - if (player instanceof ServerPlayer && ((ServerPlayer) player).connection != null) { + if (player instanceof ServerPlayer) { ((ServerPlayer) player).connection.send(packet); } } diff --git a/src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/ISimplePacket.java similarity index 89% rename from src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java rename to src/main/java/dev/ubujira/ironbarrels/common/network/helper/ISimplePacket.java index 300d1df..b2cc7f2 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/helper/ISimplePacket.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/ISimplePacket.java @@ -1,4 +1,4 @@ -package com.progwml6.ironchest.common.network.helper; +package dev.ubujira.ironbarrels.common.network.helper; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/IThreadsafePacket.java similarity index 93% rename from src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java rename to src/main/java/dev/ubujira/ironbarrels/common/network/helper/IThreadsafePacket.java index 12063f0..4112ddf 100644 --- a/src/main/java/com/progwml6/ironchest/common/network/helper/IThreadsafePacket.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/IThreadsafePacket.java @@ -1,4 +1,4 @@ -package com.progwml6.ironchest.common.network.helper; +package dev.ubujira.ironbarrels.common.network.helper; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/progwml6/ironchest/client/model/inventory/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/package-info.java similarity index 75% rename from src/main/java/com/progwml6/ironchest/client/model/inventory/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/common/network/helper/package-info.java index 294d1a3..f53395e 100644 --- a/src/main/java/com/progwml6/ironchest/client/model/inventory/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/helper/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.client.model.inventory; +package dev.ubujira.ironbarrels.common.network.helper; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/dev/ubujira/ironbarrels/common/network/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/network/package-info.java new file mode 100644 index 0000000..3d69e78 --- /dev/null +++ b/src/main/java/dev/ubujira/ironbarrels/common/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package dev.ubujira.ironbarrels.common.network; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/client/package-info.java b/src/main/java/dev/ubujira/ironbarrels/common/package-info.java similarity index 81% rename from src/main/java/com/progwml6/ironchest/client/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/common/package-info.java index cda3c2b..6870d11 100644 --- a/src/main/java/com/progwml6/ironchest/client/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/common/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest.client; +package dev.ubujira.ironbarrels.common; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/progwml6/ironchest/package-info.java b/src/main/java/dev/ubujira/ironbarrels/package-info.java similarity index 83% rename from src/main/java/com/progwml6/ironchest/package-info.java rename to src/main/java/dev/ubujira/ironbarrels/package-info.java index 567fa08..167d4eb 100644 --- a/src/main/java/com/progwml6/ironchest/package-info.java +++ b/src/main/java/dev/ubujira/ironbarrels/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.progwml6.ironchest; +package dev.ubujira.ironbarrels; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index af1978b..82cdbde 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,28 +1,28 @@ modLoader="javafml" -loaderVersion="${loader_range}" -issueTrackerURL="https://github.com/progwml6/ironchest/issues" -license="GNU General Public License v3.0" +loaderVersion = "${loader_range}" +issueTrackerURL = "https://code.ubujira.dev/Ubujira/ironbarrels/issues" +license = "GNU General Public License v3.0" [[mods]] - modId="ironchest" - namespace="ironchest" - version="${version}" - displayName="Iron Chests" - authors="cpw, alexbegt, progwml6" - description=''' -New chests with larger sizes, with in-place upgrade items. -The feature chest is the crystal chest, which is transparent - some inventory contents are visible without opening the chest +modId = "ironbarrels" +namespace = "ironbarrels" +version = "${version}" +displayName = "Iron Barrels" +authors = "cpw, alexbegt, progwml6, Ubujira" +description = ''' +New barrels with larger sizes, with in-place upgrade items. +The feature barrel is the crystal barrel, which is transparent - some inventory contents are visible without opening the chest ''' - displayURL="https://minecraft.curseforge.com/projects/iron-chests" +displayURL = "https://code.ubujira.dev/Ubujira/ironbarrels" -[[dependencies.ironchest]] +[[dependencies.ironbarrels]] modId="forge" mandatory=true versionRange="${forge_range}" ordering="NONE" side="BOTH" -[[dependencies.ironchest]] +[[dependencies.ironbarrels]] modId="minecraft" mandatory=true versionRange="${minecraft_range}" diff --git a/src/main/resources/assets/ironbarrels/blockstates/copper_chest.json b/src/main/resources/assets/ironbarrels/blockstates/copper_chest.json new file mode 100644 index 0000000..8803275 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/copper_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/copper_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/blockstates/crystal_chest.json b/src/main/resources/assets/ironbarrels/blockstates/crystal_chest.json new file mode 100644 index 0000000..0767175 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/crystal_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/crystal_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/blockstates/diamond_chest.json b/src/main/resources/assets/ironbarrels/blockstates/diamond_chest.json new file mode 100644 index 0000000..0a44558 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/diamond_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/diamond_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/blockstates/gold_chest.json b/src/main/resources/assets/ironbarrels/blockstates/gold_chest.json new file mode 100644 index 0000000..867043e --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/gold_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/gold_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/blockstates/iron_chest.json b/src/main/resources/assets/ironbarrels/blockstates/iron_chest.json new file mode 100644 index 0000000..09a252b --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/iron_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/iron_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/blockstates/obsidian_chest.json b/src/main/resources/assets/ironbarrels/blockstates/obsidian_chest.json new file mode 100644 index 0000000..b6d286a --- /dev/null +++ b/src/main/resources/assets/ironbarrels/blockstates/obsidian_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ironbarrels:block/obsidian_chest" + } + } +} diff --git a/src/main/resources/assets/ironbarrels/lang/de_de.json b/src/main/resources/assets/ironbarrels/lang/de_de.json new file mode 100644 index 0000000..308f709 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/de_de.json @@ -0,0 +1,27 @@ +{ + "_comment": "Item Groups", + "block.ironbarrels.iron_chest": "Eisenfass", + "block.ironbarrels.gold_chest": "Goldfass", + "block.ironbarrels.diamond_chest": "Diamantfass", + "block.ironbarrels.copper_chest": "Kupferfass", + "block.ironbarrels.crystal_chest": "Kristallfass", + "block.ironbarrels.obsidian_chest": "Obsidianfass", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Upgrade: Eisen zu Goldfass", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Upgrade: Gold zu Diamantfass", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Upgrade: Kupfer zu Silberfass", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Upgrade: Silber zu Goldfass", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Upgrade: Kupfer zu Eisenfass", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Upgrade: Diamant zu Kristallfass", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Upgrade: Holz zu Eisenfass", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Upgrade: Holz zu Kupferfass", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Upgrade: Diamant zu Obsidianfass", + "ironbarrels.container.iron_chest": "Eisenfass", + "ironbarrels.container.gold_chest": "Goldfass", + "ironbarrels.container.diamond_chest": "Diamantfass", + "ironbarrels.container.copper_chest": "Kupferfass", + "ironbarrels.container.silver_chest": "Silberfass", + "ironbarrels.container.crystal_chest": "Kristallfass", + "ironbarrels.container.obsidian_chest": "Obsidianfass", + "itemGroup.ironbarrels": "Eisenfässer", + "block.ironbarrels.silver_chest": "Silberfass" +} diff --git a/src/main/resources/assets/ironbarrels/lang/en_ud.json b/src/main/resources/assets/ironbarrels/lang/en_ud.json new file mode 100644 index 0000000..caed70c --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/en_ud.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "\u0287s\u01DD\u0265\u0186 uo\u0279I", + "block.ironbarrels.gold_chest": "\u0287s\u01DD\u0265\u0186 p\u05DFo\u2141", + "block.ironbarrels.diamond_chest": "\u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1", + "block.ironbarrels.copper_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186", + "block.ironbarrels.silver_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S", + "block.ironbarrels.crystal_chest": "\u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186", + "block.ironbarrels.obsidian_chest": "\u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 p\u05DFo\u2141 o\u27D8 uo\u0279I", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1 o\u27D8 p\u05DFo\u2141", + "item.ironbarrels.copper_to_silver_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S o\u27D8 \u0279\u01DDddo\u0186", + "item.ironbarrels.silver_to_gold_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 p\u05DFo\u2141 o\u27D8 \u0279\u01DD\u028C\u05DF\u0131S", + "item.ironbarrels.copper_to_iron_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 uo\u0279I o\u27D8 \u0279\u01DDddo\u0186", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186 o\u27D8 puo\u026F\u0250\u0131\u15E1", + "item.ironbarrels.wood_to_iron_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 uo\u0279I o\u27D8 pooM", + "item.ironbarrels.wood_to_copper_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186 o\u27D8 pooM", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO o\u27D8 puo\u026F\u0250\u0131\u15E1", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "\u0287s\u01DD\u0265\u0186 uo\u0279I", + "ironbarrels.container.gold_chest": "\u0287s\u01DD\u0265\u0186 p\u05DFo\u2141", + "ironbarrels.container.diamond_chest": "\u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1", + "ironbarrels.container.copper_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186", + "ironbarrels.container.silver_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S", + "ironbarrels.container.crystal_chest": "\u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186", + "ironbarrels.container.obsidian_chest": "\u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "s\u0287s\u01DD\u0265\u0186 uo\u0279I" +} diff --git a/src/main/resources/assets/ironbarrels/lang/en_us.json b/src/main/resources/assets/ironbarrels/lang/en_us.json new file mode 100644 index 0000000..0e087ed --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/en_us.json @@ -0,0 +1,29 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Iron Barrel", + "block.ironbarrels.gold_chest": "Gold Barrel", + "block.ironbarrels.diamond_chest": "Diamond Barrel", + "block.ironbarrels.copper_chest": "Copper Barrel", + "block.ironbarrels.crystal_chest": "Crystal Barrel", + "block.ironbarrels.obsidian_chest": "Obsidian Barrel", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Iron to Gold Barrel Upgrade", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Gold to Diamond Barrel Upgrade", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Copper to Silver Barrel Upgrade", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Silver to Gold Barrel Upgrade", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Copper to Iron Barrel Upgrade", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Diamond to Crystal Barrel Upgrade", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Wood to Iron Barrel Upgrade", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Wood to Copper Barrel Upgrade", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Diamond to Obsidian Barrel Upgrade", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "Iron Barrel", + "ironbarrels.container.gold_chest": "Gold Barrel", + "ironbarrels.container.diamond_chest": "Diamond Barrel", + "ironbarrels.container.copper_chest": "Copper Barrel", + "ironbarrels.container.silver_chest": "Silver Barrel", + "ironbarrels.container.crystal_chest": "Crystal Barrel", + "ironbarrels.container.obsidian_chest": "Obsidian Barrel", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Barrels" +} diff --git a/src/main/resources/assets/ironbarrels/lang/es_ar.json b/src/main/resources/assets/ironbarrels/lang/es_ar.json new file mode 100644 index 0000000..e121a4d --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/es_ar.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Cofre de hierro", + "block.ironbarrels.gold_chest": "Cofre de oro", + "block.ironbarrels.diamond_chest": "Cofre de diamante", + "block.ironbarrels.copper_chest": "Cofre de cobre", + "block.ironbarrels.silver_chest": "Cofre de plata", + "block.ironbarrels.crystal_chest": "Cofre de cristal", + "block.ironbarrels.obsidian_chest": "Cofre de obsidiana", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "Cofre de hierro", + "ironbarrels.container.gold_chest": "Cofre de oro", + "ironbarrels.container.diamond_chest": "Cofre de diamante", + "ironbarrels.container.copper_chest": "Cofre de cobre", + "ironbarrels.container.silver_chest": "Cofre de plata", + "ironbarrels.container.crystal_chest": "Cofre de cristal", + "ironbarrels.container.obsidian_chest": "Cofre de obsidiana", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/es_es.json b/src/main/resources/assets/ironbarrels/lang/es_es.json new file mode 100644 index 0000000..e121a4d --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/es_es.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Cofre de hierro", + "block.ironbarrels.gold_chest": "Cofre de oro", + "block.ironbarrels.diamond_chest": "Cofre de diamante", + "block.ironbarrels.copper_chest": "Cofre de cobre", + "block.ironbarrels.silver_chest": "Cofre de plata", + "block.ironbarrels.crystal_chest": "Cofre de cristal", + "block.ironbarrels.obsidian_chest": "Cofre de obsidiana", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "Cofre de hierro", + "ironbarrels.container.gold_chest": "Cofre de oro", + "ironbarrels.container.diamond_chest": "Cofre de diamante", + "ironbarrels.container.copper_chest": "Cofre de cobre", + "ironbarrels.container.silver_chest": "Cofre de plata", + "ironbarrels.container.crystal_chest": "Cofre de cristal", + "ironbarrels.container.obsidian_chest": "Cofre de obsidiana", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/es_mx.json b/src/main/resources/assets/ironbarrels/lang/es_mx.json new file mode 100644 index 0000000..e121a4d --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/es_mx.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Cofre de hierro", + "block.ironbarrels.gold_chest": "Cofre de oro", + "block.ironbarrels.diamond_chest": "Cofre de diamante", + "block.ironbarrels.copper_chest": "Cofre de cobre", + "block.ironbarrels.silver_chest": "Cofre de plata", + "block.ironbarrels.crystal_chest": "Cofre de cristal", + "block.ironbarrels.obsidian_chest": "Cofre de obsidiana", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "Cofre de hierro", + "ironbarrels.container.gold_chest": "Cofre de oro", + "ironbarrels.container.diamond_chest": "Cofre de diamante", + "ironbarrels.container.copper_chest": "Cofre de cobre", + "ironbarrels.container.silver_chest": "Cofre de plata", + "ironbarrels.container.crystal_chest": "Cofre de cristal", + "ironbarrels.container.obsidian_chest": "Cofre de obsidiana", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/fr_fr.json b/src/main/resources/assets/ironbarrels/lang/fr_fr.json new file mode 100644 index 0000000..e01fecd --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/fr_fr.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Coffre en fer", + "block.ironbarrels.gold_chest": "Coffre en or", + "block.ironbarrels.diamond_chest": "Coffre en diamant", + "block.ironbarrels.copper_chest": "Coffre en cuivre", + "block.ironbarrels.silver_chest": "Coffre en argent", + "block.ironbarrels.crystal_chest": "Coffre de cristal", + "block.ironbarrels.obsidian_chest": "Coffre en obsidienne", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Amélioration Fer à Or", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Amélioration Or à Diamant", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Amélioration Cuivre à Argent", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Amélioration Argent à Or", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Amélioration Cuivre à Fer", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Amélioration Diamant à Cristal", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Amélioration Bois à Fer", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Amélioration Bois à Cuivre", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Amélioration Diamant à Obsidienne", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "Coffre en fer", + "ironbarrels.container.gold_chest": "Coffre en or", + "ironbarrels.container.diamond_chest": "Coffre en diamant", + "ironbarrels.container.copper_chest": "Coffre en cuivre", + "ironbarrels.container.silver_chest": "Coffre en argent", + "ironbarrels.container.crystal_chest": "Coffre de cristal", + "ironbarrels.container.obsidian_chest": "Coffre en obsidienne", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/ko_kr.json b/src/main/resources/assets/ironbarrels/lang/ko_kr.json new file mode 100644 index 0000000..ebc4ffa --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/ko_kr.json @@ -0,0 +1,22 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "철 상자", + "block.ironbarrels.gold_chest": "금 상자", + "block.ironbarrels.diamond_chest": "다이아몬드 상자", + "block.ironbarrels.copper_chest": "구리 상자", + "block.ironbarrels.silver_chest": "은 상자", + "block.ironbarrels.crystal_chest": "수정 상자", + "block.ironbarrels.obsidian_chest": "흑요석 상자", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "철 상자를 금 상자로 업그레이드", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "금 상자를 다이아몬드 상자로 업그레이드", + "item.ironbarrels.copper_to_silver_chest_upgrade": "구리 상자를 은 상자로 업그레이드", + "item.ironbarrels.silver_to_gold_chest_upgrade": "은 상자를 금 상자로 업그레이드", + "item.ironbarrels.copper_to_iron_chest_upgrade": "구리 상자를 철 상자로 업그레이드", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "다이아몬드 상자를 수정 상자로 업그레이드", + "item.ironbarrels.wood_to_iron_chest_upgrade": "나무 상자를 철 상자로 업그레이드", + "item.ironbarrels.wood_to_copper_chest_upgrade": "나무 상자를 구리 상자로 업그레이드", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "다이아몬드 상자를 흑요석 상자로 업그레이드", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/pl_pl.json b/src/main/resources/assets/ironbarrels/lang/pl_pl.json new file mode 100644 index 0000000..5ac8f3e --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/pl_pl.json @@ -0,0 +1,22 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "Żelazna skrzynia", + "block.ironbarrels.gold_chest": "Złota skrzynia", + "block.ironbarrels.diamond_chest": "Diamentowa skrzynia", + "block.ironbarrels.copper_chest": "Miedziana skrzynia", + "block.ironbarrels.silver_chest": "Srebrna skrzynia", + "block.ironbarrels.crystal_chest": "Kryształowa skrzynia", + "block.ironbarrels.obsidian_chest": "Obsydianowa skrzynia", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "Ulepszenie żelaznej skrzyni na złotą", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "Ulepszenie złotej skrzyni na diamentową", + "item.ironbarrels.copper_to_silver_chest_upgrade": "Ulepszenie miedzianej skrzyni na srebrną", + "item.ironbarrels.silver_to_gold_chest_upgrade": "Ulepszenie srebrnej skrzyni na złotą", + "item.ironbarrels.copper_to_iron_chest_upgrade": "Ulepszenie miedzianej skrzyni na żelazną", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "Ulepszenie diamentowej skrzyni na kryształową", + "item.ironbarrels.wood_to_iron_chest_upgrade": "Ulepszenie drewnianej skrzyni na żelazną", + "item.ironbarrels.wood_to_copper_chest_upgrade": "Ulepszenie drewnianej skrzyni na miedzianą", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "Ulepszenie diamentowej skrzyni na obsydianową", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/zh_cn.json b/src/main/resources/assets/ironbarrels/lang/zh_cn.json new file mode 100644 index 0000000..3ca1e25 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/zh_cn.json @@ -0,0 +1,22 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "铁箱子", + "block.ironbarrels.gold_chest": "金箱子", + "block.ironbarrels.diamond_chest": "钻石箱子", + "block.ironbarrels.copper_chest": "铜箱子", + "block.ironbarrels.silver_chest": "银箱子", + "block.ironbarrels.crystal_chest": "水晶箱子", + "block.ironbarrels.obsidian_chest": "黑曜石箱子", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "升级：铁>金", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "升级：金>钻石", + "item.ironbarrels.copper_to_silver_chest_upgrade": "升级：铜>银", + "item.ironbarrels.silver_to_gold_chest_upgrade": "升级：银>金", + "item.ironbarrels.copper_to_iron_chest_upgrade": "升级：铜>铁", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "升级：钻石>水晶", + "item.ironbarrels.wood_to_iron_chest_upgrade": "升级：木>铁", + "item.ironbarrels.wood_to_copper_chest_upgrade": "升级：木>铜", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "升级：钻石>黑曜石", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironbarrels/lang/zh_tw.json b/src/main/resources/assets/ironbarrels/lang/zh_tw.json new file mode 100644 index 0000000..75b705c --- /dev/null +++ b/src/main/resources/assets/ironbarrels/lang/zh_tw.json @@ -0,0 +1,30 @@ +{ + "_comment": "Blocks", + "block.ironbarrels.iron_chest": "鐵箱", + "block.ironbarrels.gold_chest": "金箱", + "block.ironbarrels.diamond_chest": "鑽石箱", + "block.ironbarrels.copper_chest": "銅箱", + "block.ironbarrels.silver_chest": "銀箱", + "block.ironbarrels.crystal_chest": "水晶箱", + "block.ironbarrels.obsidian_chest": "黑曜石箱", + "_comment": "Upgrades", + "item.ironbarrels.iron_to_gold_chest_upgrade": "鐵箱升級成金箱", + "item.ironbarrels.gold_to_diamond_chest_upgrade": "金箱升級成鑽石箱", + "item.ironbarrels.copper_to_silver_chest_upgrade": "銅箱升級成銀箱", + "item.ironbarrels.silver_to_gold_chest_upgrade": "銀箱升級成金箱", + "item.ironbarrels.copper_to_iron_chest_upgrade": "銅箱升級成鐵箱", + "item.ironbarrels.diamond_to_crystal_chest_upgrade": "鑽石箱升級成水晶箱", + "item.ironbarrels.wood_to_iron_chest_upgrade": "木箱升級成鐵箱", + "item.ironbarrels.wood_to_copper_chest_upgrade": "木箱升級成銅箱", + "item.ironbarrels.diamond_to_obsidian_chest_upgrade": "鑽石箱升級成黑曜石箱", + "_comment": "Containers", + "ironbarrels.container.iron_chest": "鐵箱", + "ironbarrels.container.gold_chest": "金箱", + "ironbarrels.container.diamond_chest": "鑽石箱", + "ironbarrels.container.copper_chest": "銅箱", + "ironbarrels.container.silver_chest": "銀箱", + "ironbarrels.container.crystal_chest": "水晶箱", + "ironbarrels.container.obsidian_chest": "黑曜石箱", + "_comment": "Item Groups", + "itemGroup.ironbarrels": "Iron Chests" +} diff --git a/src/main/resources/assets/ironchest/models/block/copper_chest.json b/src/main/resources/assets/ironbarrels/models/block/copper_chest.json similarity index 95% rename from src/main/resources/assets/ironchest/models/block/copper_chest.json rename to src/main/resources/assets/ironbarrels/models/block/copper_chest.json index e74d288..13999e0 100644 --- a/src/main/resources/assets/ironchest/models/block/copper_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/copper_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/copper_chest", - "particle": "ironchest:block/copper_break" + "texture": "ironbarrels:model/copper_chest", + "particle": "ironbarrels:block/copper_break" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/block/crystal_chest.json b/src/main/resources/assets/ironbarrels/models/block/crystal_chest.json similarity index 94% rename from src/main/resources/assets/ironchest/models/block/crystal_chest.json rename to src/main/resources/assets/ironbarrels/models/block/crystal_chest.json index edb2ce1..3786f75 100644 --- a/src/main/resources/assets/ironchest/models/block/crystal_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/crystal_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/crystal_chest", - "particle": "ironchest:block/crystal_break" + "texture": "ironbarrels:model/crystal_chest", + "particle": "ironbarrels:block/crystal_break" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/block/diamond_chest.json b/src/main/resources/assets/ironbarrels/models/block/diamond_chest.json similarity index 94% rename from src/main/resources/assets/ironchest/models/block/diamond_chest.json rename to src/main/resources/assets/ironbarrels/models/block/diamond_chest.json index c257ff5..ff1ce7a 100644 --- a/src/main/resources/assets/ironchest/models/block/diamond_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/diamond_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/diamond_chest", - "particle": "ironchest:block/diamond_break" + "texture": "ironbarrels:model/diamond_chest", + "particle": "ironbarrels:block/diamond_break" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/block/gold_chest.json b/src/main/resources/assets/ironbarrels/models/block/gold_chest.json similarity index 95% rename from src/main/resources/assets/ironchest/models/block/gold_chest.json rename to src/main/resources/assets/ironbarrels/models/block/gold_chest.json index 0b1e05f..1ec62ba 100644 --- a/src/main/resources/assets/ironchest/models/block/gold_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/gold_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/gold_chest", - "particle": "ironchest:block/gold_break" + "texture": "ironbarrels:model/gold_chest", + "particle": "ironbarrels:block/gold_break" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/block/iron_chest.json b/src/main/resources/assets/ironbarrels/models/block/iron_chest.json similarity index 95% rename from src/main/resources/assets/ironchest/models/block/iron_chest.json rename to src/main/resources/assets/ironbarrels/models/block/iron_chest.json index fc7ee55..3a2ded0 100644 --- a/src/main/resources/assets/ironchest/models/block/iron_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/iron_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/iron_chest", - "particle": "ironchest:block/iron_break" + "texture": "ironbarrels:model/iron_chest", + "particle": "ironbarrels:block/iron_break" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/block/dirt_chest.json b/src/main/resources/assets/ironbarrels/models/block/obsidian_chest.json similarity index 95% rename from src/main/resources/assets/ironchest/models/block/dirt_chest.json rename to src/main/resources/assets/ironbarrels/models/block/obsidian_chest.json index 0f87c3d..c7882e9 100644 --- a/src/main/resources/assets/ironchest/models/block/dirt_chest.json +++ b/src/main/resources/assets/ironbarrels/models/block/obsidian_chest.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "texture": "ironchest:model/dirt_chest", - "particle": "minecraft:block/dirt" + "texture": "ironbarrels:model/obsidian_chest", + "particle": "minecraft:block/obsidian" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/ironchest/models/item/copper_chest.json b/src/main/resources/assets/ironbarrels/models/item/copper_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/copper_chest.json rename to src/main/resources/assets/ironbarrels/models/item/copper_chest.json diff --git a/src/main/resources/assets/ironchest/models/item/copper_to_iron_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/copper_to_iron_chest_upgrade.json similarity index 51% rename from src/main/resources/assets/ironchest/models/item/copper_to_iron_chest_upgrade.json rename to src/main/resources/assets/ironbarrels/models/item/copper_to_iron_chest_upgrade.json index 3926f7a..363f7ee 100644 --- a/src/main/resources/assets/ironchest/models/item/copper_to_iron_chest_upgrade.json +++ b/src/main/resources/assets/ironbarrels/models/item/copper_to_iron_chest_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ironchest:item/copper_iron_upgrade" + "layer0": "ironbarrels:item/copper_iron_upgrade" } } diff --git a/src/main/resources/assets/ironchest/models/item/crystal_chest.json b/src/main/resources/assets/ironbarrels/models/item/crystal_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/crystal_chest.json rename to src/main/resources/assets/ironbarrels/models/item/crystal_chest.json diff --git a/src/main/resources/assets/ironchest/models/item/diamond_chest.json b/src/main/resources/assets/ironbarrels/models/item/diamond_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/diamond_chest.json rename to src/main/resources/assets/ironbarrels/models/item/diamond_chest.json diff --git a/src/main/resources/assets/ironbarrels/models/item/diamond_to_crystal_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/diamond_to_crystal_chest_upgrade.json new file mode 100644 index 0000000..10f1876 --- /dev/null +++ b/src/main/resources/assets/ironbarrels/models/item/diamond_to_crystal_chest_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ironbarrels:item/diamond_crystal_upgrade" + } +} diff --git a/src/main/resources/assets/ironbarrels/models/item/diamond_to_obsidian_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/diamond_to_obsidian_chest_upgrade.json new file mode 100644 index 0000000..1e64fdd --- /dev/null +++ b/src/main/resources/assets/ironbarrels/models/item/diamond_to_obsidian_chest_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ironbarrels:item/diamond_obsidian_upgrade" + } +} diff --git a/src/main/resources/assets/ironchest/models/item/gold_chest.json b/src/main/resources/assets/ironbarrels/models/item/gold_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/gold_chest.json rename to src/main/resources/assets/ironbarrels/models/item/gold_chest.json diff --git a/src/main/resources/assets/ironchest/models/item/gold_to_diamond_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/gold_to_diamond_chest_upgrade.json similarity index 50% rename from src/main/resources/assets/ironchest/models/item/gold_to_diamond_chest_upgrade.json rename to src/main/resources/assets/ironbarrels/models/item/gold_to_diamond_chest_upgrade.json index 62eec1f..e5b042a 100644 --- a/src/main/resources/assets/ironchest/models/item/gold_to_diamond_chest_upgrade.json +++ b/src/main/resources/assets/ironbarrels/models/item/gold_to_diamond_chest_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ironchest:item/gold_diamond_upgrade" + "layer0": "ironbarrels:item/gold_diamond_upgrade" } } diff --git a/src/main/resources/assets/ironchest/models/item/iron_chest.json b/src/main/resources/assets/ironbarrels/models/item/iron_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/iron_chest.json rename to src/main/resources/assets/ironbarrels/models/item/iron_chest.json diff --git a/src/main/resources/assets/ironchest/models/item/iron_to_gold_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/iron_to_gold_chest_upgrade.json similarity index 52% rename from src/main/resources/assets/ironchest/models/item/iron_to_gold_chest_upgrade.json rename to src/main/resources/assets/ironbarrels/models/item/iron_to_gold_chest_upgrade.json index 7691286..8b403c8 100644 --- a/src/main/resources/assets/ironchest/models/item/iron_to_gold_chest_upgrade.json +++ b/src/main/resources/assets/ironbarrels/models/item/iron_to_gold_chest_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ironchest:item/iron_gold_upgrade" + "layer0": "ironbarrels:item/iron_gold_upgrade" } } diff --git a/src/main/resources/assets/ironchest/models/item/obsidian_chest.json b/src/main/resources/assets/ironbarrels/models/item/obsidian_chest.json similarity index 100% rename from src/main/resources/assets/ironchest/models/item/obsidian_chest.json rename to src/main/resources/assets/ironbarrels/models/item/obsidian_chest.json diff --git a/src/main/resources/assets/ironchest/models/item/wood_to_copper_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/wood_to_copper_chest_upgrade.json similarity index 51% rename from src/main/resources/assets/ironchest/models/item/wood_to_copper_chest_upgrade.json rename to src/main/resources/assets/ironbarrels/models/item/wood_to_copper_chest_upgrade.json index 9195b8d..d44818b 100644 --- a/src/main/resources/assets/ironchest/models/item/wood_to_copper_chest_upgrade.json +++ b/src/main/resources/assets/ironbarrels/models/item/wood_to_copper_chest_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ironchest:item/wood_copper_upgrade" + "layer0": "ironbarrels:item/wood_copper_upgrade" } } diff --git a/src/main/resources/assets/ironchest/models/item/wood_to_iron_chest_upgrade.json b/src/main/resources/assets/ironbarrels/models/item/wood_to_iron_chest_upgrade.json similarity index 52% rename from src/main/resources/assets/ironchest/models/item/wood_to_iron_chest_upgrade.json rename to src/main/resources/assets/ironbarrels/models/item/wood_to_iron_chest_upgrade.json index 91ed026..0d41516 100644 --- a/src/main/resources/assets/ironchest/models/item/wood_to_iron_chest_upgrade.json +++ b/src/main/resources/assets/ironbarrels/models/item/wood_to_iron_chest_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ironchest:item/wood_iron_upgrade" + "layer0": "ironbarrels:item/wood_iron_upgrade" } } diff --git a/src/main/resources/assets/ironchest/textures/block/copper_break.png b/src/main/resources/assets/ironbarrels/textures/block/copper_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/copper_break.png rename to src/main/resources/assets/ironbarrels/textures/block/copper_break.png diff --git a/src/main/resources/assets/ironchest/textures/block/crystal_break.png b/src/main/resources/assets/ironbarrels/textures/block/crystal_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/crystal_break.png rename to src/main/resources/assets/ironbarrels/textures/block/crystal_break.png diff --git a/src/main/resources/assets/ironchest/textures/block/diamond_break.png b/src/main/resources/assets/ironbarrels/textures/block/diamond_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/diamond_break.png rename to src/main/resources/assets/ironbarrels/textures/block/diamond_break.png diff --git a/src/main/resources/assets/ironchest/textures/block/gold_break.png b/src/main/resources/assets/ironbarrels/textures/block/gold_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/gold_break.png rename to src/main/resources/assets/ironbarrels/textures/block/gold_break.png diff --git a/src/main/resources/assets/ironchest/textures/block/iron_break.png b/src/main/resources/assets/ironbarrels/textures/block/iron_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/iron_break.png rename to src/main/resources/assets/ironbarrels/textures/block/iron_break.png diff --git a/src/main/resources/assets/ironchest/textures/block/silver_break.png b/src/main/resources/assets/ironbarrels/textures/block/silver_break.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/block/silver_break.png rename to src/main/resources/assets/ironbarrels/textures/block/silver_break.png diff --git a/src/main/resources/assets/ironchest/textures/gui/copper_container.png b/src/main/resources/assets/ironbarrels/textures/gui/copper_container.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/gui/copper_container.png rename to src/main/resources/assets/ironbarrels/textures/gui/copper_container.png diff --git a/src/main/resources/assets/ironchest/textures/gui/diamond_container.png b/src/main/resources/assets/ironbarrels/textures/gui/diamond_container.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/gui/diamond_container.png rename to src/main/resources/assets/ironbarrels/textures/gui/diamond_container.png diff --git a/src/main/resources/assets/ironchest/textures/gui/gold_container.png b/src/main/resources/assets/ironbarrels/textures/gui/gold_container.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/gui/gold_container.png rename to src/main/resources/assets/ironbarrels/textures/gui/gold_container.png diff --git a/src/main/resources/assets/ironchest/textures/gui/iron_container.png b/src/main/resources/assets/ironbarrels/textures/gui/iron_container.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/gui/iron_container.png rename to src/main/resources/assets/ironbarrels/textures/gui/iron_container.png diff --git a/src/main/resources/assets/ironchest/textures/gui/silver_container.png b/src/main/resources/assets/ironbarrels/textures/gui/silver_container.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/gui/silver_container.png rename to src/main/resources/assets/ironbarrels/textures/gui/silver_container.png diff --git a/src/main/resources/assets/ironchest/textures/item/copper_iron_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/copper_iron_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/copper_iron_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/copper_iron_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/diamond_crystal_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/diamond_crystal_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/diamond_crystal_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/diamond_crystal_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/diamond_netherite_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/diamond_netherite_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/diamond_netherite_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/diamond_netherite_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/diamond_obsidian_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/diamond_obsidian_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/diamond_obsidian_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/diamond_obsidian_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/gold_diamond_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/gold_diamond_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/gold_diamond_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/gold_diamond_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/iron_gold_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/iron_gold_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/iron_gold_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/iron_gold_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/wood_copper_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/wood_copper_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/wood_copper_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/wood_copper_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/item/wood_iron_upgrade.png b/src/main/resources/assets/ironbarrels/textures/item/wood_iron_upgrade.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/item/wood_iron_upgrade.png rename to src/main/resources/assets/ironbarrels/textures/item/wood_iron_upgrade.png diff --git a/src/main/resources/assets/ironchest/textures/model/copper_chest.png b/src/main/resources/assets/ironbarrels/textures/model/copper_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/copper_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/copper_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/crystal_chest.png b/src/main/resources/assets/ironbarrels/textures/model/crystal_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/crystal_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/crystal_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/diamond_chest.png b/src/main/resources/assets/ironbarrels/textures/model/diamond_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/diamond_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/diamond_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/gold_chest.png b/src/main/resources/assets/ironbarrels/textures/model/gold_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/gold_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/gold_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/iron_chest.png b/src/main/resources/assets/ironbarrels/textures/model/iron_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/iron_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/iron_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/netherite_chest.png b/src/main/resources/assets/ironbarrels/textures/model/netherite_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/netherite_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/netherite_chest.png diff --git a/src/main/resources/assets/ironchest/textures/model/obsidian_chest.png b/src/main/resources/assets/ironbarrels/textures/model/obsidian_chest.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/model/obsidian_chest.png rename to src/main/resources/assets/ironbarrels/textures/model/obsidian_chest.png diff --git a/src/main/resources/assets/ironchest/blockstates/copper_chest.json b/src/main/resources/assets/ironchest/blockstates/copper_chest.json deleted file mode 100644 index f765c30..0000000 --- a/src/main/resources/assets/ironchest/blockstates/copper_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/copper_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/crystal_chest.json b/src/main/resources/assets/ironchest/blockstates/crystal_chest.json deleted file mode 100644 index 9358350..0000000 --- a/src/main/resources/assets/ironchest/blockstates/crystal_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/crystal_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/diamond_chest.json b/src/main/resources/assets/ironchest/blockstates/diamond_chest.json deleted file mode 100644 index eb4f51b..0000000 --- a/src/main/resources/assets/ironchest/blockstates/diamond_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/diamond_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/dirt_chest.json b/src/main/resources/assets/ironchest/blockstates/dirt_chest.json deleted file mode 100644 index 1d03205..0000000 --- a/src/main/resources/assets/ironchest/blockstates/dirt_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/dirt_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/gold_chest.json b/src/main/resources/assets/ironchest/blockstates/gold_chest.json deleted file mode 100644 index 1f782cb..0000000 --- a/src/main/resources/assets/ironchest/blockstates/gold_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/gold_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/iron_chest.json b/src/main/resources/assets/ironchest/blockstates/iron_chest.json deleted file mode 100644 index 56834a3..0000000 --- a/src/main/resources/assets/ironchest/blockstates/iron_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/iron_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/obsidian_chest.json b/src/main/resources/assets/ironchest/blockstates/obsidian_chest.json deleted file mode 100644 index 6a84603..0000000 --- a/src/main/resources/assets/ironchest/blockstates/obsidian_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/obsidian_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_copper_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_copper_chest.json deleted file mode 100644 index 3909929..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_copper_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_copper_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_crystal_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_crystal_chest.json deleted file mode 100644 index 4ce07c0..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_crystal_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_crystal_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_diamond_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_diamond_chest.json deleted file mode 100644 index 2d698f9..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_diamond_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_diamond_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_dirt_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_dirt_chest.json deleted file mode 100644 index 349d752..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_dirt_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_dirt_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_gold_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_gold_chest.json deleted file mode 100644 index 8a52f56..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_gold_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_gold_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_iron_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_iron_chest.json deleted file mode 100644 index 4f93262..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_iron_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_iron_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/blockstates/trapped_obsidian_chest.json b/src/main/resources/assets/ironchest/blockstates/trapped_obsidian_chest.json deleted file mode 100644 index 925651d..0000000 --- a/src/main/resources/assets/ironchest/blockstates/trapped_obsidian_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "ironchest:block/trapped_obsidian_chest" } - } -} diff --git a/src/main/resources/assets/ironchest/lang/de_de.json b/src/main/resources/assets/ironchest/lang/de_de.json deleted file mode 100644 index 9e526df..0000000 --- a/src/main/resources/assets/ironchest/lang/de_de.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Eisentruhe", - "block.ironchest.gold_chest": "Goldtruhe", - "block.ironchest.diamond_chest": "Diamanttruhe", - "block.ironchest.copper_chest": "Kupfertruhe", - "block.ironchest.silver_chest": "Silbertruhe", - "block.ironchest.crystal_chest": "Kristalltruhe", - "block.ironchest.obsidian_chest": "Obsidiantruhe", - "block.ironchest.dirt_chest": "ErdTruhe 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Upgrade: Eisen zu Goldtruhe", - "item.ironchest.gold_to_diamond_chest_upgrade": "Upgrade: Gold zu Diamanttruhe", - "item.ironchest.copper_to_silver_chest_upgrade": "Upgrade: Kupfer zu Silbertruhe", - "item.ironchest.silver_to_gold_chest_upgrade": "Upgrade: Silber zu Goldtruhe", - "item.ironchest.copper_to_iron_chest_upgrade": "Upgrade: Kupfer zu Eisentruhe", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Upgrade: Diamant zu Kristalltruhe", - "item.ironchest.wood_to_iron_chest_upgrade": "Upgrade: Holz zu Eisentruhe", - "item.ironchest.wood_to_copper_chest_upgrade": "Upgrade: Holz zu Kupfertruhe", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Upgrade: Diamant zu Obsidiantruhe", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "Bedienungsanleitung für ihre ErdTruhe 9000!", - "book.ironchest.dirtchest9000.page1": "Vielen Dank, dass sie sich für eine neue ErdTruhe 9000 entschieden haben. Wir hoffen, dass sie für Jahre Freude daran haben werden, ihre Erde in dieser Truhe zu lagern.", - "book.ironchest.dirtchest9000.page2": "Benutzung: füllen sie einfach einen Stack Erde nach Wahl in den äußerst aufnahmefähigen Slot ein und erfreuen sie sich jedes Mal, wenn sie an dieser Truhe vorbeilaufen, an der Bequemlichkeit, diese Erde jederzeit verfügbar zu haben.", - "book.ironchest.dirtchest9000.page3": "Wir hoffen, dass ihnen diese Bedienungsanleitung gefallen hat und dass sie sich auch in Zukunft für unsere Produkte entscheiden werden! Mit freundlichen Grüßen, ihre ErdTruhe 9000 GmbH & Co. KG", - "book.ironchest.dirtchest9000.page4": "Garantiebestimmungen: Wir übernehmen keine Gewährleistung für dieses Produkt. Ihre Erde könnte zufällig verschwinden, langsam auf den Boden rieseln oder auch überhaupt nicht gespeichert werden.", - "book.ironchest.dirtchest9000.page5": "DirtChest 9000 achtet die Umwelt. Bitte entsorgen sie diese Bedienungsanleitung fachgerecht und werfen sie sie nicht einfach in Lava. Wir wären sehr traurig.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Eisentruhe", - "ironchest.container.gold_chest": "Goldtruhe", - "ironchest.container.diamond_chest": "Diamanttruhe", - "ironchest.container.copper_chest": "Kupfertruhe", - "ironchest.container.silver_chest": "Silbertruhe", - "ironchest.container.crystal_chest": "Kristalltruhe", - "ironchest.container.obsidian_chest": "Obsidiantruhe", - "ironchest.container.dirt_chest": "ErdTruhe 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Eisentruhen" -} diff --git a/src/main/resources/assets/ironchest/lang/en_ud.json b/src/main/resources/assets/ironchest/lang/en_ud.json deleted file mode 100644 index 40622ca..0000000 --- a/src/main/resources/assets/ironchest/lang/en_ud.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "_comment": "Blocks", - - "block.ironchest.iron_chest": "\u0287s\u01DD\u0265\u0186 uo\u0279I", - "block.ironchest.gold_chest": "\u0287s\u01DD\u0265\u0186 p\u05DFo\u2141", - - "block.ironchest.diamond_chest": "\u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1", - "block.ironchest.copper_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186", - "block.ironchest.silver_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S", - "block.ironchest.crystal_chest": "\u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186", - "block.ironchest.obsidian_chest": "\u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO", - "block.ironchest.dirt_chest": "\u00A10006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 p\u05DFo\u2141 o\u27D8 uo\u0279I", - "item.ironchest.gold_to_diamond_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1 o\u27D8 p\u05DFo\u2141", - "item.ironchest.copper_to_silver_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S o\u27D8 \u0279\u01DDddo\u0186", - "item.ironchest.silver_to_gold_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 p\u05DFo\u2141 o\u27D8 \u0279\u01DD\u028C\u05DF\u0131S", - "item.ironchest.copper_to_iron_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 uo\u0279I o\u27D8 \u0279\u01DDddo\u0186", - "item.ironchest.diamond_to_crystal_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186 o\u27D8 puo\u026F\u0250\u0131\u15E1", - "item.ironchest.wood_to_iron_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 uo\u0279I o\u27D8 pooM", - "item.ironchest.wood_to_copper_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186 o\u27D8 pooM", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "\u01DDp\u0250\u0279bd\u2229 \u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO o\u27D8 puo\u026F\u0250\u0131\u15E1", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "\u00A10006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1 \u0279no\u028E \u01DDsn o\u0287 \u028DoH", - "book.ironchest.dirtchest9000.page1": "\u02D9\u028E\u0287\u0131\u05DF\u0131\u0287n \u01DDb\u0250\u0279o\u0287s \u0279no u\u0131 \u0287\u0279\u0131p \u025Fo \u029E\u0254\u0250\u0287s \u0279no\u028E bu\u0131\u0279o\u0287s \u025Fo s\u0279\u0250\u01DD\u028E \u028Edd\u0250\u0265 \u028Eu\u0250\u026F \u028Eo\u0638u\u01DD \u05DF\u05DF\u0131\u028D no\u028E \u01DDdo\u0265 \u01DDM \u00A10006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1 \u028D\u01DDu \u0279no\u028E o\u0287 \u01DD\u026Fo\u0254\u05DF\u01DDM", - "book.ironchest.dirtchest9000.page2": "\u00A1\u0287s\u01DD\u0265\u0254 s\u0131\u0265\u0287 \u028Eq ss\u0250d no\u028E \u01DD\u026F\u0131\u0287 \u028Eu\u0250 'no\u028E o\u0287 \u01DD\u05DFq\u0250\u05DF\u0131\u0250\u028C\u0250 \u0287\u0279\u0131p \u0287\u0250\u0265\u0287 bu\u0131\u028C\u0250\u0265 \u025Fo \u01DD\u0254u\u01DD\u0131u\u01DD\u028Cuo\u0254 \u0287\u0250\u01DD\u0279b \u01DD\u0265\u0287 \u028Eo\u0638u\u01DD pu\u0250 \u0287o\u05DFs \u01DD\u028C\u0131\u0287d\u01DD\u0254\u01DD\u0279 \u028E\u05DF\u0265b\u0131\u0265 \u01DD\u0265\u0287 o\u0287u\u0131 \u01DD\u0254\u0131o\u0265\u0254 \u0279no\u028E \u025Fo \u0287\u0279\u0131p \u025Fo \u029E\u0254\u0250\u0287s \u01DD\u0265\u0287 \u0287\u0279\u01DDsu\u0131 \u028E\u05DFd\u026F\u0131s :\u01DDb\u0250s\u2229", - "book.ironchest.dirtchest9000.page3": "\u02D9p\u01DD\u0287\u0250\u0279od\u0279o\u0254u\u0131 s\u0279\u01DD\u0287\u0131\u0279\u028D \u05DF\u0250nu\u0250\u026F 0006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1 \u01DD\u0265\u27D8 'sp\u0279\u0250b\u01DD\u0279 pu\u0131\u029E \u00A1\u01DD\u0279n\u0287n\u025F u\u0131 s\u0287\u0254npo\u0279d \u0279no bu\u0131sn \u0279\u01DDp\u0131suo\u0254 \u05DF\u05DF\u0131\u028D no\u028E \u01DDdo\u0265 pu\u0250 '\u05DF\u0250nu\u0250\u026F uo\u0131\u0287\u0254n\u0279\u0287su\u0131 s\u0131\u0265\u0287 bu\u0131\u028D\u01DD\u0131\u028C\u01DD\u0279 p\u01DD\u028Eo\u0638u\u01DD \u01DD\u028C\u0250\u0265 no\u028E \u01DDdo\u0265 \u01DDM", - "book.ironchest.dirtchest9000.page4": "\u02D9\u05DF\u05DF\u0250 \u0287\u0250 bu\u0131\u0265\u0287\u028Eu\u0250 op \u0287ou \u028E\u0250\u026F \u0287\u0131 '\u028E\u05DF\u01DD\u028C\u0131\u0287\u0250u\u0279\u01DD\u0287\u05DF\u0250 \u0279o '\u0287u\u01DD\u026Fuo\u0279\u0131\u028Cu\u01DD \u01DD\u0265\u0287 o\u0287u\u0131 \u0265\u0254\u01DD\u01DD\u05DF \u028E\u05DF\u028Do\u05DFs \u028E\u0250\u026F \u0287\u0131 'p\u01DD\u0279o\u0287s \u01DDq \u0287ou \u028E\u0250\u026F \u0287\u0279\u0131p \u0279no\u028E \u02D9pu\u0131\u029E \u028Eu\u0250 \u025Fo \u028E\u0287u\u0250\u0279\u0279\u0250\u028D ou s\u0250\u0265 \u0287\u0254npo\u0279d s\u0131\u0265\u27D8 :\u028E\u0287u\u0250\u0279\u0279\u0250M", - "book.ironchest.dirtchest9000.page5": "\u02D9p\u0250s \u028E\u0279\u01DD\u028C \u01DDq p\u05DFno\u028D \u01DDM \u02D9\u0250\u028C\u0250\u05DF \u01DD\u026Fos o\u0287u\u0131 \u0287\u0131 \u029E\u0254n\u0265\u0254 \u0287sn\u0638 op no\u028E \u0279\u01DD\u028C\u01DD\u0287\u0250\u0265\u028D \u0287ou op pu\u0250 '\u028E\u05DFq\u0131suods\u01DD\u0279 \u029Eooq \u01DDp\u0131nb s\u0131\u0265\u0287 \u025Fo \u01DDsods\u0131p \u01DDs\u0250\u01DD\u05DF\u0500 \u02D9\u0287u\u01DD\u026Fuo\u0279\u0131\u028Cu\u01DD \u01DD\u0265\u0287 o\u0287 pu\u0131\u029E s\u0131 0006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1", - - "_comment": "Containers", - "ironchest.container.iron_chest": "\u0287s\u01DD\u0265\u0186 uo\u0279I", - "ironchest.container.gold_chest": "\u0287s\u01DD\u0265\u0186 p\u05DFo\u2141", - "ironchest.container.diamond_chest": "\u0287s\u01DD\u0265\u0186 puo\u026F\u0250\u0131\u15E1", - "ironchest.container.copper_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DDddo\u0186", - "ironchest.container.silver_chest": "\u0287s\u01DD\u0265\u0186 \u0279\u01DD\u028C\u05DF\u0131S", - "ironchest.container.crystal_chest": "\u0287s\u01DD\u0265\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186", - "ironchest.container.obsidian_chest": "\u0287s\u01DD\u0265\u0186 u\u0250\u0131p\u0131sqO", - "ironchest.container.dirt_chest": "\u00A10006 \u0287s\u01DD\u0265\u0186\u0287\u0279\u0131\u15E1", - - "_comment": "Item Groups", - "itemGroup.ironchest": "s\u0287s\u01DD\u0265\u0186 uo\u0279I" -} diff --git a/src/main/resources/assets/ironchest/lang/en_us.json b/src/main/resources/assets/ironchest/lang/en_us.json deleted file mode 100644 index fa8f9c9..0000000 --- a/src/main/resources/assets/ironchest/lang/en_us.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Iron Chest", - "block.ironchest.gold_chest": "Gold Chest", - "block.ironchest.diamond_chest": "Diamond Chest", - "block.ironchest.copper_chest": "Copper Chest", - "block.ironchest.crystal_chest": "Crystal Chest", - "block.ironchest.obsidian_chest": "Obsidian Chest", - "block.ironchest.dirt_chest": "DirtChest 9000!", - - "block.ironchest.trapped_iron_chest": "Trapped Iron Chest", - "block.ironchest.trapped_gold_chest": "Trapped Gold Chest", - "block.ironchest.trapped_diamond_chest": "Trapped Diamond Chest", - "block.ironchest.trapped_copper_chest": "Trapped Copper Chest", - "block.ironchest.trapped_crystal_chest": "Trapped Crystal Chest", - "block.ironchest.trapped_obsidian_chest": "Trapped Obsidian Chest", - "block.ironchest.trapped_dirt_chest": "Trapped DirtChest 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Iron to Gold Chest Upgrade", - "item.ironchest.gold_to_diamond_chest_upgrade": "Gold to Diamond Chest Upgrade", - "item.ironchest.copper_to_silver_chest_upgrade": "Copper to Silver Chest Upgrade", - "item.ironchest.silver_to_gold_chest_upgrade": "Silver to Gold Chest Upgrade", - "item.ironchest.copper_to_iron_chest_upgrade": "Copper to Iron Chest Upgrade", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Diamond to Crystal Chest Upgrade", - "item.ironchest.wood_to_iron_chest_upgrade": "Wood to Iron Chest Upgrade", - "item.ironchest.wood_to_copper_chest_upgrade": "Wood to Copper Chest Upgrade", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Diamond to Obsidian Chest Upgrade", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "How to use your DirtChest 9000!", - "book.ironchest.dirtchest9000.page1": "Welcome to your new DirtChest 9000! We hope you will enjoy many happy years of storing your stack of dirt in our storage utility.", - "book.ironchest.dirtchest9000.page2": "Usage: simply insert the stack of dirt of your choice into the highly receptive slot and enjoy the great convenience of having that dirt available to you, any time you pass by this chest!", - "book.ironchest.dirtchest9000.page3": "We hope you have enjoyed reviewing this instruction manual, and hope you will consider using our products in future! Kind regards, The DirtChest 9000 manual writers incorporated.", - "book.ironchest.dirtchest9000.page4": "Warranty: This product has no warranty of any kind. Your dirt may not be stored, it may slowly leech into the environment, or alternatively, it may not do anything at all.", - "book.ironchest.dirtchest9000.page5": "DirtChest 9000 is kind to the environment. Please dispose of this guide book responsibly, and do not whatever you do just chuck it into some lava. We would be very sad.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Iron Chest", - "ironchest.container.gold_chest": "Gold Chest", - "ironchest.container.diamond_chest": "Diamond Chest", - "ironchest.container.copper_chest": "Copper Chest", - "ironchest.container.silver_chest": "Silver Chest", - "ironchest.container.crystal_chest": "Crystal Chest", - "ironchest.container.obsidian_chest": "Obsidian Chest", - "ironchest.container.dirt_chest": "DirtChest 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/es_ar.json b/src/main/resources/assets/ironchest/lang/es_ar.json deleted file mode 100644 index ad81a6b..0000000 --- a/src/main/resources/assets/ironchest/lang/es_ar.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Cofre de hierro", - "block.ironchest.gold_chest": "Cofre de oro", - "block.ironchest.diamond_chest": "Cofre de diamante", - "block.ironchest.copper_chest": "Cofre de cobre", - "block.ironchest.silver_chest": "Cofre de plata", - "block.ironchest.crystal_chest": "Cofre de cristal", - "block.ironchest.obsidian_chest": "Cofre de obsidiana", - "block.ironchest.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", - "item.ironchest.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", - "item.ironchest.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", - "item.ironchest.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", - "item.ironchest.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", - "item.ironchest.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", - "item.ironchest.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "¡Cómo usar su CofreTierra 9000!", - "book.ironchest.dirtchest9000.page1": "¡Le damos la bienvenida a su nuevo CofreTierra 9000! Esperamos que disfrute de muchos años preservando sus montones de tierra en nuestra gran utilidad de almacenamiento.", - "book.ironchest.dirtchest9000.page2": "Modo de uso: simplemente introduzca el stack de tierra a su elección en el espacio altamente receptivo, y disfrute de la maravillosa comodidad de tener tierra disponible siempre que pase cerca del cofre", - "book.ironchest.dirtchest9000.page3": "¡Esperamos que haya disfrutado de la lectura de este manual de instrucciones, y que considere usar nuestros productos en el futuro! Saludos cordiales, los escritores del manual del CofreTierra 9000 y asociados.", - "book.ironchest.dirtchest9000.page4": "Garantía: Este producto no tiene ningún tipo de garantía. Es posible que su tierra no se preserve o que se fitre lentamente en el entorno. Alternativamente, puede que no pase nada en lo absoluto.", - "book.ironchest.dirtchest9000.page5": "CofreTierra 9000 es amigable con el ambiente. Por favor deshagase de esta guía de forma responsable y, ante todo, no lo tire en la lava. Nos pondría muy trsites.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Cofre de hierro", - "ironchest.container.gold_chest": "Cofre de oro", - "ironchest.container.diamond_chest": "Cofre de diamante", - "ironchest.container.copper_chest": "Cofre de cobre", - "ironchest.container.silver_chest": "Cofre de plata", - "ironchest.container.crystal_chest": "Cofre de cristal", - "ironchest.container.obsidian_chest": "Cofre de obsidiana", - "ironchest.container.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/es_es.json b/src/main/resources/assets/ironchest/lang/es_es.json deleted file mode 100644 index b54faa4..0000000 --- a/src/main/resources/assets/ironchest/lang/es_es.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Cofre de hierro", - "block.ironchest.gold_chest": "Cofre de oro", - "block.ironchest.diamond_chest": "Cofre de diamante", - "block.ironchest.copper_chest": "Cofre de cobre", - "block.ironchest.silver_chest": "Cofre de plata", - "block.ironchest.crystal_chest": "Cofre de cristal", - "block.ironchest.obsidian_chest": "Cofre de obsidiana", - "block.ironchest.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", - "item.ironchest.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", - "item.ironchest.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", - "item.ironchest.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", - "item.ironchest.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", - "item.ironchest.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", - "item.ironchest.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "¡Cómo usar su CofreTierra 9000!", - "book.ironchest.dirtchest9000.page1": "¡Le damos la bienvenida a su nuevo CofreTierra 9000! Esperamos que disfrute de muchos años preservando sus montones de tierra en nuestra gran utilidad de almacenamiento.", - "book.ironchest.dirtchest9000.page2": "Modo de uso: simplemente introduzca el stack de tierra a su elección en el espacio altamente receptivo, y disfrute de la maravillosa comodidad de tener tierra disponible siempre que pase cerca del cofre", - "book.ironchest.dirtchest9000.page3": "¡Esperamos que haya disfrutado de la lectura de este manual de instrucciones, y que considere usar nuestros productos en el futuro! Saludos cordiales, los escritores del manual del CofreTierra 9000 y asociados.", - "book.ironchest.dirtchest9000.page4": "Garantía: Este producto no tiene ningún tipo de garantía. Es posible que su tierra no se preserve o se filtre lentamente en el entorno. Alternativamente, puede que no pase nada en lo absoluto.", - "book.ironchest.dirtchest9000.page5": "CofreTierra 9000 es amigable con el ambiente. Por favor deshagase de esta guía de forma responsable y, ante todo, no lo tire en la lava. Nos pondría muy trsites.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Cofre de hierro", - "ironchest.container.gold_chest": "Cofre de oro", - "ironchest.container.diamond_chest": "Cofre de diamante", - "ironchest.container.copper_chest": "Cofre de cobre", - "ironchest.container.silver_chest": "Cofre de plata", - "ironchest.container.crystal_chest": "Cofre de cristal", - "ironchest.container.obsidian_chest": "Cofre de obsidiana", - "ironchest.container.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/es_mx.json b/src/main/resources/assets/ironchest/lang/es_mx.json deleted file mode 100644 index b54faa4..0000000 --- a/src/main/resources/assets/ironchest/lang/es_mx.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Cofre de hierro", - "block.ironchest.gold_chest": "Cofre de oro", - "block.ironchest.diamond_chest": "Cofre de diamante", - "block.ironchest.copper_chest": "Cofre de cobre", - "block.ironchest.silver_chest": "Cofre de plata", - "block.ironchest.crystal_chest": "Cofre de cristal", - "block.ironchest.obsidian_chest": "Cofre de obsidiana", - "block.ironchest.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Mejora de cofre de hierro a oro", - "item.ironchest.gold_to_diamond_chest_upgrade": "Mejora de cofre de oro a diamante", - "item.ironchest.copper_to_silver_chest_upgrade": "Mejora de cofre de cobre a plata", - "item.ironchest.silver_to_gold_chest_upgrade": "Mejora de cofre de plata a oro", - "item.ironchest.copper_to_iron_chest_upgrade": "Mejora de cofre de cobre a hierro", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Mejora de cofre de diamante a cristal", - "item.ironchest.wood_to_iron_chest_upgrade": "Mejora de cofre de madera a hierro", - "item.ironchest.wood_to_copper_chest_upgrade": "Mejora de cofre de madera a cobre", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Mejora de cofre de diamante a obsidiana", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "¡Cómo usar su CofreTierra 9000!", - "book.ironchest.dirtchest9000.page1": "¡Le damos la bienvenida a su nuevo CofreTierra 9000! Esperamos que disfrute de muchos años preservando sus montones de tierra en nuestra gran utilidad de almacenamiento.", - "book.ironchest.dirtchest9000.page2": "Modo de uso: simplemente introduzca el stack de tierra a su elección en el espacio altamente receptivo, y disfrute de la maravillosa comodidad de tener tierra disponible siempre que pase cerca del cofre", - "book.ironchest.dirtchest9000.page3": "¡Esperamos que haya disfrutado de la lectura de este manual de instrucciones, y que considere usar nuestros productos en el futuro! Saludos cordiales, los escritores del manual del CofreTierra 9000 y asociados.", - "book.ironchest.dirtchest9000.page4": "Garantía: Este producto no tiene ningún tipo de garantía. Es posible que su tierra no se preserve o se filtre lentamente en el entorno. Alternativamente, puede que no pase nada en lo absoluto.", - "book.ironchest.dirtchest9000.page5": "CofreTierra 9000 es amigable con el ambiente. Por favor deshagase de esta guía de forma responsable y, ante todo, no lo tire en la lava. Nos pondría muy trsites.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Cofre de hierro", - "ironchest.container.gold_chest": "Cofre de oro", - "ironchest.container.diamond_chest": "Cofre de diamante", - "ironchest.container.copper_chest": "Cofre de cobre", - "ironchest.container.silver_chest": "Cofre de plata", - "ironchest.container.crystal_chest": "Cofre de cristal", - "ironchest.container.obsidian_chest": "Cofre de obsidiana", - "ironchest.container.dirt_chest": "¡CofreTierra 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/fr_fr.json b/src/main/resources/assets/ironchest/lang/fr_fr.json deleted file mode 100644 index c5b1c43..0000000 --- a/src/main/resources/assets/ironchest/lang/fr_fr.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Coffre en fer", - "block.ironchest.gold_chest": "Coffre en or", - "block.ironchest.diamond_chest": "Coffre en diamant", - "block.ironchest.copper_chest": "Coffre en cuivre", - "block.ironchest.silver_chest": "Coffre en argent", - "block.ironchest.crystal_chest": "Coffre de cristal", - "block.ironchest.obsidian_chest": "Coffre en obsidienne", - "block.ironchest.dirt_chest": "DirtChest 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Amélioration Fer à Or", - "item.ironchest.gold_to_diamond_chest_upgrade": "Amélioration Or à Diamant", - "item.ironchest.copper_to_silver_chest_upgrade": "Amélioration Cuivre à Argent", - "item.ironchest.silver_to_gold_chest_upgrade": "Amélioration Argent à Or", - "item.ironchest.copper_to_iron_chest_upgrade": "Amélioration Cuivre à Fer", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Amélioration Diamant à Cristal", - "item.ironchest.wood_to_iron_chest_upgrade": "Amélioration Bois à Fer", - "item.ironchest.wood_to_copper_chest_upgrade": "Amélioration Bois à Cuivre", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Amélioration Diamant à Obsidienne", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "Comment utiliser votre DirtChest 9000!", - "book.ironchest.dirtchest9000.page1": "Découvrez votre nouveau DirtChest 9000! Nous espérons que vous allez aprécier de nombreuse années de stockage de terre dans notre coffre", - "book.ironchest.dirtchest9000.page2": "Utilisation: Inserrez simplement votre terre dans le slot prévu à cet effet et profitez de la simplicité de l'avoir à portée de main dés que vous passez près du coffre!", - "book.ironchest.dirtchest9000.page3": "Nous espérons que ce guide vous aura été utile et que vous continuerez d'utilisez nos produits à l'avenir! Cordialement, la rédaction des manuels DirtChest 9000.", - "book.ironchest.dirtchest9000.page4": "Garantie: Ce produit n'est sous aucune garantie d'aucune sorte. Votre terre ne rentrera peut être pas, elle s'infiltrera peut être lentement dans l'environement ou il ne se passera peut être rien du tout.", - "book.ironchest.dirtchest9000.page5": "Le DirtChest 9000 est bon pour la planette. Merci de vous débarasser de ce guide responsablement et de ne pas le jeter dans la lave, ça nous rendrait triste.", - - "_comment": "Containers", - "ironchest.container.iron_chest": "Coffre en fer", - "ironchest.container.gold_chest": "Coffre en or", - "ironchest.container.diamond_chest": "Coffre en diamant", - "ironchest.container.copper_chest": "Coffre en cuivre", - "ironchest.container.silver_chest": "Coffre en argent", - "ironchest.container.crystal_chest": "Coffre de cristal", - "ironchest.container.obsidian_chest": "Coffre en obsidienne", - "ironchest.container.dirt_chest": "DirtChest 9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/ko_kr.json b/src/main/resources/assets/ironchest/lang/ko_kr.json deleted file mode 100644 index 12b7a04..0000000 --- a/src/main/resources/assets/ironchest/lang/ko_kr.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "철 상자", - "block.ironchest.gold_chest": "금 상자", - "block.ironchest.diamond_chest": "다이아몬드 상자", - "block.ironchest.copper_chest": "구리 상자", - "block.ironchest.silver_chest": "은 상자", - "block.ironchest.crystal_chest": "수정 상자", - "block.ironchest.obsidian_chest": "흑요석 상자", - "block.ironchest.dirt_chest": "흙 상자 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "철 상자를 금 상자로 업그레이드", - "item.ironchest.gold_to_diamond_chest_upgrade": "금 상자를 다이아몬드 상자로 업그레이드", - "item.ironchest.copper_to_silver_chest_upgrade": "구리 상자를 은 상자로 업그레이드", - "item.ironchest.silver_to_gold_chest_upgrade": "은 상자를 금 상자로 업그레이드", - "item.ironchest.copper_to_iron_chest_upgrade": "구리 상자를 철 상자로 업그레이드", - "item.ironchest.diamond_to_crystal_chest_upgrade": "다이아몬드 상자를 수정 상자로 업그레이드", - "item.ironchest.wood_to_iron_chest_upgrade": "나무 상자를 철 상자로 업그레이드", - "item.ironchest.wood_to_copper_chest_upgrade": "나무 상자를 구리 상자로 업그레이드", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "다이아몬드 상자를 흑요석 상자로 업그레이드", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "흙 상자 9000을 사용하는 방법!", - "book.ironchest.dirtchest9000.page1": "새로운 흙 상자 9000을 사용하게 되신 것을 환영합니다! 우리는 당신이 이 저장 도구에서 흙들을 많은 해 동안 행복하게 저장하기를 기원합니다.", - "book.ironchest.dirtchest9000.page2": "사용법: 단순히 흙 뭉치들을 아이템 슬롯에 넣고 이 상자를 지나갈 때마다 언제나 당신에게 제공되어지는 흙들의 편리함을 누리세요!", - "book.ironchest.dirtchest9000.page3": "우리는 당신이 이 사용설명서를 즐겁게 읽었고, 나중에 이 제품을 사용하기를 바랍니다! 흙 상자 9000 매뉴얼", - "book.ironchest.dirtchest9000.page4": "주의: 이 제품에는 어떤 종류의 보증도 하지 않습니다 당신의 흙들은 저장되지 않을 수도 있습니다. 그러면 이 흙 상자는 천천히 환경 속으로 돌아가거나, 혹은 아무것도 하지 않을 것입니다.", - "book.ironchest.dirtchest9000.page5": "흙 상자 9000은 환경 친화적입니다. 가이드북의 처분에는 책임이 따릅니다, 그러니 어떠한 경우라도 용암에 버리지 마세요. 우리는 매우 슬플 것입니다.", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/pl_pl.json b/src/main/resources/assets/ironchest/lang/pl_pl.json deleted file mode 100644 index 1e6a3b3..0000000 --- a/src/main/resources/assets/ironchest/lang/pl_pl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "Żelazna skrzynia", - "block.ironchest.gold_chest": "Złota skrzynia", - "block.ironchest.diamond_chest": "Diamentowa skrzynia", - "block.ironchest.copper_chest": "Miedziana skrzynia", - "block.ironchest.silver_chest": "Srebrna skrzynia", - "block.ironchest.crystal_chest": "Kryształowa skrzynia", - "block.ironchest.obsidian_chest": "Obsydianowa skrzynia", - "block.ironchest.dirt_chest": "DirtChest 9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "Ulepszenie żelaznej skrzyni na złotą", - "item.ironchest.gold_to_diamond_chest_upgrade": "Ulepszenie złotej skrzyni na diamentową", - "item.ironchest.copper_to_silver_chest_upgrade": "Ulepszenie miedzianej skrzyni na srebrną", - "item.ironchest.silver_to_gold_chest_upgrade": "Ulepszenie srebrnej skrzyni na złotą", - "item.ironchest.copper_to_iron_chest_upgrade": "Ulepszenie miedzianej skrzyni na żelazną", - "item.ironchest.diamond_to_crystal_chest_upgrade": "Ulepszenie diamentowej skrzyni na kryształową", - "item.ironchest.wood_to_iron_chest_upgrade": "Ulepszenie drewnianej skrzyni na żelazną", - "item.ironchest.wood_to_copper_chest_upgrade": "Ulepszenie drewnianej skrzyni na miedzianą", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "Ulepszenie diamentowej skrzyni na obsydianową", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "How to use your DirtChest 9000!", - "book.ironchest.dirtchest9000.page1": "Welcome to your new DirtChest 9000! We hope you will enjoy many happy years of storing your stack of dirt in our storage utility.", - "book.ironchest.dirtchest9000.page2": "Usage: simply insert the stack of dirt of your choice into the highly receptive slot and enjoy the great convenience of having that dirt available to you, any time you pass by this chest!", - "book.ironchest.dirtchest9000.page3": "We hope you have enjoyed reviewing this instruction manual, and hope you will consider using our products in future! Kind regards, The DirtChest 9000 manual writers incorporated.", - "book.ironchest.dirtchest9000.page4": "Warranty: This product has no warranty of any kind. Your dirt may not be stored, it may slowly leech into the environment, or alternatively, it may not do anything at all.", - "book.ironchest.dirtchest9000.page5": "DirtChest 9000 is kind to the environment. Please dispose of this guide book responsibly, and do not whatever you do just chuck it into some lava. We would be very sad.", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/zh_cn.json b/src/main/resources/assets/ironchest/lang/zh_cn.json deleted file mode 100644 index f8be1c3..0000000 --- a/src/main/resources/assets/ironchest/lang/zh_cn.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "铁箱子", - "block.ironchest.gold_chest": "金箱子", - "block.ironchest.diamond_chest": "钻石箱子", - "block.ironchest.copper_chest": "铜箱子", - "block.ironchest.silver_chest": "银箱子", - "block.ironchest.crystal_chest": "水晶箱子", - "block.ironchest.obsidian_chest": "黑曜石箱子", - "block.ironchest.dirt_chest": "泥箱子9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "升级：铁>金", - "item.ironchest.gold_to_diamond_chest_upgrade": "升级：金>钻石", - "item.ironchest.copper_to_silver_chest_upgrade": "升级：铜>银", - "item.ironchest.silver_to_gold_chest_upgrade": "升级：银>金", - "item.ironchest.copper_to_iron_chest_upgrade": "升级：铜>铁", - "item.ironchest.diamond_to_crystal_chest_upgrade": "升级：钻石>水晶", - "item.ironchest.wood_to_iron_chest_upgrade": "升级：木>铁", - "item.ironchest.wood_to_copper_chest_upgrade": "升级：木>铜", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "升级：钻石>黑曜石", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "傻瓜也一定会用的泥箱子9000!", - "book.ironchest.dirtchest9000.page1": "欢迎使用这台全新的泥箱子9000!希望你能愉快地常年使用我们的设备来储存(大量)泥土(大雾)。", - "book.ironchest.dirtchest9000.page2": "使用方法: 把一组泥土丢进去就行了。每次您经过的时候都可以打开它(很方便地)取出来用。", - "book.ironchest.dirtchest9000.page3": "希望您阅读本手册愉快，并选择使用我们的产品。作为泥箱子9000手册作者我谨向您致以诚挚问候。", - "book.ironchest.dirtchest9000.page4": "质量保障: 恕本产品不提供任何质量保障。您的泥土或者能安全存储其内，或者会逐渐流失到环境中，或者什么也不会发生。(读者:我了个去!)", - "book.ironchest.dirtchest9000.page5": "泥箱子9000十分环保。请小心收藏好本手册，如果您随手丢进岩浆的话，我们可会伤心的。", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/lang/zh_tw.json b/src/main/resources/assets/ironchest/lang/zh_tw.json deleted file mode 100644 index 6568c0d..0000000 --- a/src/main/resources/assets/ironchest/lang/zh_tw.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "_comment": "Blocks", - "block.ironchest.iron_chest": "鐵箱", - "block.ironchest.gold_chest": "金箱", - "block.ironchest.diamond_chest": "鑽石箱", - "block.ironchest.copper_chest": "銅箱", - "block.ironchest.silver_chest": "銀箱", - "block.ironchest.crystal_chest": "水晶箱", - "block.ironchest.obsidian_chest": "黑曜石箱", - "block.ironchest.dirt_chest": "泥箱子9000!", - - "_comment": "Upgrades", - "item.ironchest.iron_to_gold_chest_upgrade": "鐵箱升級成金箱", - "item.ironchest.gold_to_diamond_chest_upgrade": "金箱升級成鑽石箱", - "item.ironchest.copper_to_silver_chest_upgrade": "銅箱升級成銀箱", - "item.ironchest.silver_to_gold_chest_upgrade": "銀箱升級成金箱", - "item.ironchest.copper_to_iron_chest_upgrade": "銅箱升級成鐵箱", - "item.ironchest.diamond_to_crystal_chest_upgrade": "鑽石箱升級成水晶箱", - "item.ironchest.wood_to_iron_chest_upgrade": "木箱升級成鐵箱", - "item.ironchest.wood_to_copper_chest_upgrade": "木箱升級成銅箱", - "item.ironchest.diamond_to_obsidian_chest_upgrade": "鑽石箱升級成黑曜石箱", - - "_comment": "Books", - "book.ironchest.dirtchest9000.title": "笨蛋也一定會用的泥土箱9000!", - "book.ironchest.dirtchest9000.page1": "歡迎使用全新的泥土箱9000!希望你能夠愉快地常年使用我們的設備來儲存泥土。", - "book.ironchest.dirtchest9000.page2": "使用方法: 把一組泥土丟進去就行了。每次您經過的時候都可以打開它(很方便地)取出來用", - "book.ironchest.dirtchest9000.page3": "我們希望您喜歡閱讀本說明手冊，並希望將來考慮使用我們的產品！作為泥箱子9000手冊作者我謹向您致以誠摯問候。", - "book.ironchest.dirtchest9000.page4": "品質保障: 本產品不提供任何形式的保證。您的泥土可能不會被存儲，可能會慢慢滲入環境中，或者根本無法做任何事情。", - "book.ironchest.dirtchest9000.page5": "泥箱子9000十分環保。請小心收藏好本手冊，如果你隨手丟進岩漿的話，我們會很傷心。", - - "_comment": "Containers", - "ironchest.container.iron_chest": "鐵箱", - "ironchest.container.gold_chest": "金箱", - "ironchest.container.diamond_chest": "鑽石箱", - "ironchest.container.copper_chest": "銅箱", - "ironchest.container.silver_chest": "銀箱", - "ironchest.container.crystal_chest": "水晶箱", - "ironchest.container.obsidian_chest": "黑曜石箱", - "ironchest.container.dirt_chest": "泥箱子9000!", - - "_comment": "Item Groups", - "itemGroup.ironchest": "Iron Chests" -} diff --git a/src/main/resources/assets/ironchest/models/block/obsidian_chest.json b/src/main/resources/assets/ironchest/models/block/obsidian_chest.json deleted file mode 100644 index 4f53d0d..0000000 --- a/src/main/resources/assets/ironchest/models/block/obsidian_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/obsidian_chest", - "particle": "minecraft:block/obsidian" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_copper_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_copper_chest.json deleted file mode 100644 index 50eee16..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_copper_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_copper_chest", - "particle": "ironchest:block/copper_break" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_crystal_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_crystal_chest.json deleted file mode 100644 index 3633c2b..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_crystal_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_crystal_chest", - "particle": "ironchest:block/crystal_break" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_diamond_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_diamond_chest.json deleted file mode 100644 index 0bc13de..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_diamond_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_diamond_chest", - "particle": "ironchest:block/diamond_break" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_dirt_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_dirt_chest.json deleted file mode 100644 index 0b9a3df..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_dirt_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_dirt_chest", - "particle": "minecraft:block/dirt" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_gold_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_gold_chest.json deleted file mode 100644 index fe06988..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_gold_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_gold_chest", - "particle": "ironchest:block/gold_break" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_iron_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_iron_chest.json deleted file mode 100644 index ff8fe1b..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_iron_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_iron_chest", - "particle": "ironchest:block/iron_break" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/block/trapped_obsidian_chest.json b/src/main/resources/assets/ironchest/models/block/trapped_obsidian_chest.json deleted file mode 100644 index 34bd7de..0000000 --- a/src/main/resources/assets/ironchest/models/block/trapped_obsidian_chest.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "texture": "ironchest:model/trapped_obsidian_chest", - "particle": "minecraft:block/obsidian" - }, - "elements": [ - { "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 7, 4.75, 10.5, 8.25 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 8.25, 7, 10.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 8.25, 14, 10.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 8.25, 10.5, 10.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#texture" } - } - }, - { "from": [ 1, 9, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 3.5, 0, 7, 3.5 ], "texture": "#texture" }, - "north": { "uv": [ 3.5, 3.5, 7, 4.75 ], "texture": "#texture" }, - "south": { "uv": [ 10.5, 3.5, 14, 4.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 3.5, 10.5, 4.75 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#texture" } - } - }, - { "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0, 0.75, 1.25, 0.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0.25, 0.75, 0.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.25, 0.25, 0.75, 1.25 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0.25, 1.5, 1.25 ], "texture": "#texture" }, - "west": { "uv": [ 0.75, 0.25, 1, 1.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0.25, 0.25, 1.25 ], "texture": "#texture" } - } - } - ] -} diff --git a/src/main/resources/assets/ironchest/models/item/diamond_to_crystal_chest_upgrade.json b/src/main/resources/assets/ironchest/models/item/diamond_to_crystal_chest_upgrade.json deleted file mode 100644 index db18ca6..0000000 --- a/src/main/resources/assets/ironchest/models/item/diamond_to_crystal_chest_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ironchest:item/diamond_crystal_upgrade" - } -} diff --git a/src/main/resources/assets/ironchest/models/item/diamond_to_obsidian_chest_upgrade.json b/src/main/resources/assets/ironchest/models/item/diamond_to_obsidian_chest_upgrade.json deleted file mode 100644 index bd507f4..0000000 --- a/src/main/resources/assets/ironchest/models/item/diamond_to_obsidian_chest_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ironchest:item/diamond_obsidian_upgrade" - } -} diff --git a/src/main/resources/assets/ironchest/models/item/dirt_chest.json b/src/main/resources/assets/ironchest/models/item/dirt_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/dirt_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_copper_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_copper_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_copper_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_crystal_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_crystal_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_crystal_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_diamond_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_diamond_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_diamond_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_dirt_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_dirt_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_dirt_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_gold_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_gold_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_gold_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_iron_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_iron_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_iron_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/trapped_obsidian_chest.json b/src/main/resources/assets/ironchest/models/item/trapped_obsidian_chest.json deleted file mode 100644 index 7bfe2e6..0000000 --- a/src/main/resources/assets/ironchest/models/item/trapped_obsidian_chest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 1, 1, 1] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 0, 0], - "scale": [ 0.4, 0.4, 0.4 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/textures/gui/dirt_container.png b/src/main/resources/assets/ironchest/textures/gui/dirt_container.png deleted file mode 100644 index 44667e17a43026f4ea93fa2b78dedeade1690a8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3588 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 Hb$t3S1AP45 diff --git a/src/main/resources/assets/ironchest/textures/model/dirt_chest.png b/src/main/resources/assets/ironchest/textures/model/dirt_chest.png deleted file mode 100644 index 0feb4ee5e9e72cb649ec8aea86c7bef0ac78c072..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5452 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 Ze(B8dT!)hNPTK!FeWv?)9&%s2>R-W`hb;gA diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_copper_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_copper_chest.png deleted file mode 100644 index ae239a984150d7cbb08a8375de919c5b898224a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5300 zcmcIo2~-nV)()Z|vZ*MIYsVl6LM4@*M0NtQ$RdWVT`QGJh-4!P5JZ+1Q9KUqhJqr> zv?GX$G%C1)wy4lL2*L;g3b?f>AmRcdivJ5BZO^Z*=bwLaPExPlz3;Byz4x7L3h-NK zIAQt(91dsb<;e*IPiM_{ybkz1EQ)La4?VeOm=cH6H_?2xaC`Qefkn268>$NRUBpIZ z5+cHv@i3xVA_v?!oV}A;j-U~k3eUrYBB=wR``iTrUc`4GgwTCqU%49=F7jNXz?Q7> zUfpqoaKCD1~@PIUglqVoZWbRZ751 z9_5vX%TzLDxaup90)VeHMAEXQe)y!jtE3XIb;Nb_9-Ro&lJ#r z{s`Ac*IhtTlmMp6k@n<@2uD_8k>lqh4fFXtsvRnT=r9?9Fba(Zu`oUlqM|%Hg-=Cb zI>xgnX*v@SfgfHCizWTF{^8_!iZu4bj##k-iyXBFKhz@F2s#{GR8wFWpD?m5`V7Rr zEt$h&W5O|z#=j`MVK${qpo&2hn2QkP{;P#e`l9hNX*8zz#C$oTK)}es6iNqzKp~Uh zM~e`zlHn1#Tr5I|phk+8@<+P*XgCR9)T2bA|2jkz0hx{mjJ00jRnM4;hNAPSQUh8#>|(-}4}d8jx2UqUn@8x2RKLJSOS(tqF#89^`s z9ZXKL0C>cLX)pvFz(8NYSPUvkrwCZA&pGqi?)k0G&^~SC!-u}b8T6|N_)5|>xEKY= zmxIQ~6rxWs@F~tlO~4N!?*B*MR}uGZegA(W?!TO*p^i1&Zb<*$iH6@f!;$pRROirj zgZ;Ul^Q{;J_YXE0VqY0+R5Dq>5NM_%lg@)sI~oIwBPI(BdcI{c7I-_A~ zMdHgjqLAaZv853a5@=H`UVKJRZQ?fjY5mDx{od7#P1egyu%A-vT2yycdiP{}hnvrn zT_qzdx6o(vXFMn%R^|xH(5bE~e9||0U zgFSnVuP?hBH>kX^m(_PCuKFlH%rxZKvZCC)yv8C_x2~>kCQHHjdENbYD@8g_cz5=s zRZraHu9cZqjRVi@Xh_V8@HY@S8Y!L49BZiz zW>)-L8g3Kk5<9vx)F-9aZQq-663(nIRx9&@yrk*IqiIob@-tJ6g4EmKs@OAYm$dYh zSDR0YnR&84pzCUTyVWV_T}4w@Tk(;{>JLr6IAR9AZG$R*@r}IHj=wJ-SY?#EB0ib-n4oRt1<*$mCzsW-#~mu1>xD z^Au8P$}w$IwN~la7RyLsR&dmvgqJ0@sr^R}&CfjycPh0B6Rbk8iVat| zTZ00)dJ+DKm%eu{@Kx{Fu|r}ad_bM+J)LC&yT55R-b+0aQaG0Q9oRY1GmU`UG@6p+ zx=#+b+dt>c>0ahWoObKfHjZ@)t+it2FM+#O8g2_s?>X{#d}>DOF}Ie8p*B-UeMXN?gjA zyqOo&bX?bd_9^oP8Q!d}t=FAjOQxJxP!0Em6nGC)5aFg-AjJj zi`$t!`_}sJj@g#u3739aztu+|zU|XgYPDcz$17s% zjHo!zbefSENCr(IK2xyRIz1mc-P&sCp>>K|=x;arB z7jvR-X06Z0GQEq}FLZ1_>nSR@NDpDx8eDqS#40R*$d-j{dJzF zr)YapC*wS|xlO;E_lm-Z;ua;d*ozI?#1dFZ=nATufc!-N9MtbhA0~bb0Nr z71K^$N4uW3&pYdAwBLW8S31p9Klbrh;rBv`t?3IZk4al9x;p#10)IFMQ1Up-)v0Dj z+yY2~-JG>z9-9LdIr+7-$MouW%s*IQpR%asH*F7M^0w z{elmbW1a`KRX)&V6A!-Dckuu5T_X2Jo{97OzgIZgIPWU`aoe8OG0|Q}vp?9h3&(o4 z>O1kf3>p#*6J&m!bsO&>a<%?~Wpn9i|5(XcH`RK_t9iHI zw!?saZ{7Ri*q?uju~wJ5)R%26sIJG%XTG4fFRlE2W>(gdh;dK4gvLMMJ~St!anIbw zPc+iW-m&l4Zt?rJU)j2C3CVD`yu=RusPdfsMoGi|ilvpbsgw?LjHU^A^OR2XHvYovVpWo?*_4rBH6`=uM0BU;@xDG~{**Zf+SPq4j-M6CxX+BMPf0enK_`}+ z6}I)BcHY>p+EA2p#JcdHHqMkfyr~_CNbY5mEt_YMTGV-x zmQwMyd9ypV_vLI|Ditamt0CXD4lPfk5vzT<=XV)_v9)&AoBj(QEDUOV9!8XOI{HU7 zubz&Ty=>IJaql10mb&FV2?J^0?MbPbx4T+q8($&6JsUne>C7`<`&K7EDm U!MJ=I&HsvC?tYwOuB+Dl5B#?vQvd(} diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_crystal_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_crystal_chest.png deleted file mode 100644 index e078608c26e5eaaabffe840fac4ecb8a52c6a443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4435 zcmcgw3s@6Z79K>9Vo^|Q1+9*uE?68glXn8B5T3Rmj}!srF`1c=5t0c>3=dn%3ex&q zD1ud>LTg*CE7htjilR~A(yv6_F7lBQlZ*G09pmANEX>00k;akHcxIWVKF`=EXAUm4LBvn$3buBKjmRmbcL$ z92Fc2OBpQ%3*1qJKv4lK6uXnS94F-Rc`yg%U~H7f#&`&dO1NSPj|UHaSiqc?R7k>o z{RfSKH!qe_uh&S}?9|j$_f)PsqfKOEVzHQwa@ZUW0wfS!x>}E?A!?oTkOp5$M`&q{ zo@UgrQ6nyAR_MK00P27bDvepKS~nOc5HWTdu3=;DsL>~rAW4|zG%K{pCgUW*rjjWY zrPk|!EM}I~C>cGYQ!*o{HZMP60K_&p*lgpeSX3&r37y{00NfZ1$Wx_tvUCl_4ySa? z3N1nT830V@A#Zg0aO!b9pJ6)?H*eO{iV^l2SDtW+N~1>*HLjRNH4>?o!u5<+#xTi4 zr3pQs~B4v^p zEieqwafi+MXd|%(!XE*e90)V8Wtt16)2QSqUm8S4X96MM4PS|Vas@P?$Ke`s z-5VrD2WYArY)?LT;@~Kmo?#VWG zCZGZy7!9ap|G9lrzmNpdMm*_*C?cp7GalH~A|yC55M07oU=+z3oTi^bv1d!>fZ9|g z1=9E@g*PCkV-)&STuXT;g4~Z<*z6I(Gin2+9R^>6YjJSoP+FZAOQB^{u(=3fJpa6HiSPv?6cH#u-G~*SZa@L^6(l7hP!6Er zA3_8g4hP`~W#EuQc@nAwllpl(8ms}m`3V6*>%GnfdIlb9SwP=y#rco-;N z5r+^VA~7x!a(JW&M?vlUr!!COp3mwGZ+Igg*z_#U5Ti0+l%yMZVJ6AQK_e+GJ&Xgx zd1i(Hn;7@Mu{SE?o~`fy-;-qOSOe{b{l`u;@a{VhNq=K?nywp?r}dm?D)E}Y?aGWjiC)#0E^m41Rz`8;ESuemE5h!to3^BPf4yi+=8^G7 zzYsO-vz3Ag8Nv<~vQS=Bq&`#Mu{+cW#^k7D6BoX*{_4!hrB8L*n^ zYMu@45f!`;uE&>;fzaX(D`>mDgHyvBy8|bbwyv}E+3{Ugz`d|;&*x-@zxOZQvCU(y z@BA5uS-s^OV?HgMZe8G}%3ns;g`cjvbhGZ*+(u>mg228hjfqVTmpZI#9dcIk+_4W& z?(GPV_Fw0`+o}JX!b%&_`IP|Wq77Azf3rUD=&WOF%GjOxn>8zce$n+4-uAe(me*Z8 zblhcIPP9#dI+9+3rfO4dAZkbT<$R9{!=cYl+cmE2u1Rfsc<+3z@2(9YIRzoge@@n4 z{^BcLt(6OqqoG-E~#BtIL>n|4?F1Cf;`Tkw! z8J&~zO8Lq1Hvaa_S@W8cl^O4J_0-S2=?M4p{EoMeYi~aOs%wt@T-I)@=8tO^yljod zyJ@+eTOD%?u&aqkL*t|`l_{;7gucS+9mr*_;r-jkZ#aK8&2~;}>zZ%ATRRq=8gMtx z)*+{0Z??})M@y?Ra#yikL{=o-#gwIRId#zono_>L*ClECD}o|0q74?PD{$>$zZC z2d|&y*AB!^k7W$STMjaA6@@K*F=1E6j}2K@60&8+J?Q%4-n`B^ZtFwV=es1Yi`85VkeG=Ve>jtNqOc(wcBFEq!CF)mHc1 zBArz^fw(nqEp9)vtmJTei|dPd?^~Qb^~r)h4d>MLucm}$e&bX>X?Fhcy4w0P`*ylQ z5PQNsTO9!S(Z=%+Pwf4qHglVE)yci0tlYpKTzh0)76yB}eDCAyT#serJ)g5>zxqU^ zAL}?V%^`So{KGcsw}!Mg0h`xxqgj)#Jq%f09FpT666YN0H*xn1cMa`A=#8H*P>}pL zw;r9f>r1oV^8et?hqTD){t1{C;*FfV zj@DabbI(t)7@ip6_{!qGO*dq3e*PfMCff0f&XNfymfIVaMHU@tFFY6dz}IKjJJ}Yn zzV!+T+P&%f(w8^!> diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_diamond_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_diamond_chest.png deleted file mode 100644 index 7fb3e9810c27c28c929e35604e8a5fcb80d2984e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5272 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 Yo0)Mp&!o;y^WUMPgR}j?c|Pm^1rLKT-~a#s diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_dirt_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_dirt_chest.png deleted file mode 100644 index f77e4a60b7690b52828670f1d217dc18a12c0d83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5599 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 Hkc58$Sw{XE diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_netherite_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_netherite_chest.png deleted file mode 100644 index d93b61de7825a173ddc5d11d3679159efec2f87b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5391 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 PzbtL6>{)ph-ckPoRghpw diff --git a/src/main/resources/assets/ironchest/textures/model/trapped_obsidian_chest.png b/src/main/resources/assets/ironchest/textures/model/trapped_obsidian_chest.png deleted file mode 100644 index d79a21ee7266b4b8eb852c8d62b7bdc298f4e4b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5140 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 Q`u}zwZr-kW&LQ9a8