Added textures for Open Crate and Trash Box

Hiiragi283 · Nov 12, 2024 · 41ff8cd · 41ff8cd
1 parent a0ebbbd
commit 41ff8cd
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 74 deletions.
diff --git a/src/main/generated/assets/ragium/blockstates/open_crate.json b/src/main/generated/assets/ragium/blockstates/open_crate.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/open_crate"
+    }
+  }
+}
diff --git a/src/main/generated/assets/ragium/blockstates/trash_box.json b/src/main/generated/assets/ragium/blockstates/trash_box.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/trash_box"
+    }
+  }
+}
diff --git a/src/main/generated/assets/ragium/lang/en_us.json b/src/main/generated/assets/ragium/lang/en_us.json
@@ -9,6 +9,7 @@
   "block.ragium.advanced_hull": "Advanced Hull",
   "block.ragium.asphalt": "Asphalt",
   "block.ragium.auto_illuminator": "Auto Illuminator",
+  "block.ragium.backpack_interface": "Backpack Interface",
   "block.ragium.basic_casing": "Basic Casing",
   "block.ragium.basic_coil": "Basic Coil",
   "block.ragium.basic_drum": "Basic Drum",
@@ -24,6 +25,7 @@
   "block.ragium.manual_grinder": "Ragi-Grinder",
   "block.ragium.manual_mixer": "Ragi-Basin",
   "block.ragium.network_interface": "E.N.I.",
+  "block.ragium.open_crate": "Open Crate",
   "block.ragium.porous_netherrack": "Porous Netherrack",
   "block.ragium.primitive_casing": "Primitive Casing",
   "block.ragium.primitive_coil": "Primitive Coil",

diff --git a/src/main/generated/assets/ragium/lang/ja_jp.json b/src/main/generated/assets/ragium/lang/ja_jp.json
@@ -9,6 +9,7 @@
   "block.ragium.advanced_hull": "発展筐体",
   "block.ragium.asphalt": "アスファルト",
   "block.ragium.auto_illuminator": "光源置き太郎",
+  "block.ragium.backpack_interface": "バックパックインターフェース",
   "block.ragium.basic_casing": "基本外装",
   "block.ragium.basic_coil": "基本コイル",
   "block.ragium.basic_drum": "基本ドラム",
@@ -24,6 +25,7 @@
   "block.ragium.manual_grinder": "らぎ臼",
   "block.ragium.manual_mixer": "らぎ釜",
   "block.ragium.network_interface": "E.N.I.",
+  "block.ragium.open_crate": "オープンクレート",
   "block.ragium.porous_netherrack": "多孔質ネザーラック",
   "block.ragium.primitive_casing": "簡易外装",
   "block.ragium.primitive_coil": "簡易コイル",

diff --git a/src/main/generated/assets/ragium/models/block/open_crate.json b/src/main/generated/assets/ragium/models/block/open_crate.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "ragium:block/open_crate"
+  }
+}
diff --git a/src/main/generated/assets/ragium/models/block/trash_box.json b/src/main/generated/assets/ragium/models/block/trash_box.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "ragium:block/trash_box"
+  }
+}
diff --git a/src/main/generated/assets/ragium/models/item/open_crate.json b/src/main/generated/assets/ragium/models/item/open_crate.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ragium:block/open_crate"
+}
diff --git a/src/main/generated/assets/ragium/models/item/trash_box.json b/src/main/generated/assets/ragium/models/item/trash_box.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ragium:block/trash_box"
+}
diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt
@@ -12,7 +12,7 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.world.World
 
 object RagiumBlocks : HTContentRegister {
-    //    Blocks - Minerals    //
+    //    Minerals    //
     @JvmField
     val POROUS_NETHERRACK: Block =
         registerBlock(
@@ -25,12 +25,12 @@ object RagiumBlocks : HTContentRegister {
             },
         )
 
-    //    Blocks - Buildings    //
+    //    Buildings    //
 
     @JvmField
     val ASPHALT: Block = registerCopy("asphalt", Blocks.SMOOTH_STONE)
 
-    //    Blocks - Foods    //
+    //    Foods    //
 
     @JvmField
     val SPONGE_CAKE: Block =
@@ -40,10 +40,13 @@ object RagiumBlocks : HTContentRegister {
     val SWEET_BERRIES_CAKE: Block =
         registerBlock("sweet_berries_cake", HTSweetBerriesCakeBlock)
 
-    //    Blocks - Utilities    //
-
     @JvmField
-    val BACKPACK_INTERFACE: Block = registerBlock("backpack_interface", HTBackpackInterfaceBlock)
+    val FOODS: List<Block> = listOf(
+        SPONGE_CAKE,
+        SWEET_BERRIES_CAKE,
+    )
+
+    //    Mechanics    //
 
     @JvmField
     val AUTO_ILLUMINATOR: Block = registerWithBE("auto_illuminator", RagiumBlockEntityTypes.AUTO_ILLUMINATOR)
@@ -52,14 +55,6 @@ object RagiumBlocks : HTContentRegister {
     val CREATIVE_SOURCE: Block =
         registerWithBE("creative_source", RagiumBlockEntityTypes.CREATIVE_SOURCE, Blocks.COMMAND_BLOCK)
 
-    @JvmField
-    val ENCHANT_BOOKSHELF: Block =
-        registerWithBE("enchantment_bookshelf", RagiumBlockEntityTypes.ENCHANTMENT_BOOKSHELF, Blocks.BOOKSHELF)
-
-    @JvmField
-    val ITEM_DISPLAY: Block =
-        registerBlock("item_display", HTItemDisplayBlock)
-
     @JvmField
     val LARGE_PROCESSOR: Block =
         registerBlock("large_processor", HTLargeProcessorBlock)
@@ -84,10 +79,6 @@ object RagiumBlocks : HTContentRegister {
     val OPEN_CRATE: Block =
         registerCopy("open_crate", Blocks.SMOOTH_STONE)
 
-    @JvmField
-    val SHAFT: Block =
-        registerBlock("shaft", HTThinPillarBlock(blockSettings(Blocks.CHAIN)))
-
     @JvmField
     val TELEPORT_ANCHOR: Block =
         registerCopy("teleport_anchor", Blocks.SMOOTH_STONE)
@@ -96,7 +87,47 @@ object RagiumBlocks : HTContentRegister {
     val TRASH_BOX: Block =
         registerBlock("trash_box")
 
+    @JvmField
+    val MECHANICS: List<Block> = listOf(
+        LARGE_PROCESSOR, // red
+        AUTO_ILLUMINATOR, // yellow
+        OPEN_CRATE, // green
+        TELEPORT_ANCHOR, // blue
+        CREATIVE_SOURCE, // purple
+        TRASH_BOX, // gray
+        NETWORK_INTERFACE, // white
+        // manual machines
+        MANUAL_FORGE,
+        MANUAL_GRINDER,
+        MANUAL_MIXER,
+    )
+
+    //    Misc    //
+
+    @JvmField
+    val BACKPACK_INTERFACE: Block = registerBlock("backpack_interface", HTBackpackInterfaceBlock)
+
+    @JvmField
+    val ENCHANT_BOOKSHELF: Block =
+        registerWithBE("enchantment_bookshelf", RagiumBlockEntityTypes.ENCHANTMENT_BOOKSHELF, Blocks.BOOKSHELF)
+
+    @JvmField
+    val ITEM_DISPLAY: Block =
+        registerBlock("item_display", HTItemDisplayBlock)
+
+    @JvmField
+    val SHAFT: Block =
+        registerBlock("shaft", HTThinPillarBlock(blockSettings(Blocks.CHAIN)))
+
     @JvmField
     val INFESTING: Block =
         registerBlock("infesting", HTInfectingBlock)
+
+    @JvmField
+    val MISC: List<Block> = listOf(
+        BACKPACK_INTERFACE,
+        ENCHANT_BOOKSHELF,
+        ITEM_DISPLAY,
+        SHAFT,
+    )
 }
diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt
@@ -50,16 +50,16 @@ object RagiumItemGroup {
                     }
                     addAll(RagiumContents.RawMaterials.entries)
 
+                    addAll(RagiumBlocks.FOODS)
+                    addAll(RagiumItems.FOODS)
+
                     addAll(RagiumItems.ARMORS)
                     addAll(RagiumItems.TOOLS)
                     addAll(HTCrafterHammerItem.Behavior.entries)
 
-                    addAll(RagiumContents.CircuitBoards.entries)
-                    addAll(RagiumContents.Circuits.entries)
-
-                    add(RagiumBlocks.SPONGE_CAKE)
-                    add(RagiumBlocks.SWEET_BERRIES_CAKE)
+                    addAll(RagiumBlocks.MISC)
                     addAll(RagiumItems.MISC)
+
                     remove(RagiumItems.BACKPACK)
                     remove(RagiumItems.FILLED_FLUID_CUBE)
                 }.forEach(entries::add)
@@ -89,25 +89,14 @@ object RagiumItemGroup {
                     addAll(RagiumContents.Hulls.entries)
                     addAll(RagiumContents.Coils.entries)
 
-                    add(RagiumBlocks.LARGE_PROCESSOR)
-                    add(RagiumBlocks.AUTO_ILLUMINATOR)
-                    add(RagiumBlocks.TELEPORT_ANCHOR)
-                    add(RagiumBlocks.CREATIVE_SOURCE)
-
-                    add(RagiumBlocks.MANUAL_FORGE)
-                    add(RagiumBlocks.MANUAL_GRINDER)
-                    add(RagiumBlocks.MANUAL_MIXER)
-
-                    add(RagiumBlocks.BACKPACK_INTERFACE)
-                    add(RagiumBlocks.ITEM_DISPLAY)
-                    add(RagiumBlocks.NETWORK_INTERFACE)
-                    add(RagiumBlocks.OPEN_CRATE)
-                    add(RagiumBlocks.SHAFT)
-                    add(RagiumBlocks.TRASH_BOX)
-
+                    addAll(RagiumContents.Drums.entries)
                     addAll(RagiumContents.Exporters.entries)
                     addAll(RagiumContents.Pipes.entries)
-                    addAll(RagiumContents.Drums.entries)
+
+                    addAll(RagiumContents.CircuitBoards.entries)
+                    addAll(RagiumContents.Circuits.entries)
+
+                    addAll(RagiumBlocks.MECHANICS)
                 }.forEach(entries::add)
                 RagiumAPI
                     .getInstance()

diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt
@@ -85,6 +85,30 @@ object RagiumItems : HTContentRegister {
 
     //    Tools    //
 
+    @JvmField
+    val BACKPACK: Item = registerItem("backpack", HTBackpackItem)
+
+    @JvmField
+    val BUJIN: Item = registerItem("bujin", HTBujinItem)
+
+    @JvmField
+    val CRAFTER_HAMMER: Item = registerItem("crafter_hammer", HTCrafterHammerItem)
+
+    @JvmField
+    val DYNAMITE: Item = registerItem("dynamite", HTDynamiteItem)
+
+    @JvmField
+    val EMPTY_FLUID_CUBE: Item = registerItem("empty_fluid_cube")
+
+    @JvmField
+    val FILLED_FLUID_CUBE: Item = registerItem("filled_fluid_cube", HTFilledFluidCubeItem)
+
+    @JvmField
+    val FORGE_HAMMER: Item = registerItem("forge_hammer", HTForgeHammerItem)
+
+    @JvmField
+    val REMOVER_DYNAMITE: Item = registerItem("remover_dynamite", HTRemoverDynamiteItem)
+
     @JvmField
     val STEEL_AXE: Item = registerToolItem("steel_axe", HTToolType.AXE, RagiumToolMaterials.STEEL)
 
@@ -101,15 +125,25 @@ object RagiumItems : HTContentRegister {
     val STEEL_SWORD: Item = registerToolItem("steel_sword", HTToolType.SWORD, RagiumToolMaterials.STEEL)
 
     @JvmField
-    val BUJIN: Item = registerItem("bujin", HTBujinItem)
+    val TRADER_CATALOG: Item = registerItem("trader_catalog", HTTraderCatalogItem)
 
     @JvmField
     val TOOLS: List<Item> = listOf(
+        // damageable tool
         STEEL_AXE,
         STEEL_HOE,
         STEEL_PICKAXE,
         STEEL_SHOVEL,
         STEEL_SWORD,
+        CRAFTER_HAMMER,
+        FORGE_HAMMER,
+        // non-damageable tool
+        BACKPACK,
+        DYNAMITE,
+        EMPTY_FLUID_CUBE,
+        FILLED_FLUID_CUBE,
+        REMOVER_DYNAMITE,
+        TRADER_CATALOG,
         BUJIN,
     )
 
@@ -175,39 +209,21 @@ object RagiumItems : HTContentRegister {
 
     //    Misc    //
 
-    @JvmField
-    val BACKPACK: Item = registerItem("backpack", HTBackpackItem)
-
     @JvmField
     val BASALT_MESH: Item = registerItem("basalt_mesh")
 
-    @JvmField
-    val CRAFTER_HAMMER: Item = registerItem("crafter_hammer", HTCrafterHammerItem)
-
     @JvmField
     val CRIMSON_CRYSTAL: Item = registerItem("crimson_crystal")
 
     @JvmField
     val DEEPANT: Item = registerItem("deepant")
 
-    @JvmField
-    val DYNAMITE: Item = registerItem("dynamite", HTDynamiteItem)
-
-    @JvmField
-    val EMPTY_FLUID_CUBE: Item = registerItem("empty_fluid_cube")
-
     @JvmField
     val ENGINE: Item = registerItem("engine")
 
     @JvmField
     val ENGINEERING_PLASTIC_PLATE: Item = registerItem("engineering_plastic_plate")
 
-    @JvmField
-    val FILLED_FLUID_CUBE: Item = registerItem("filled_fluid_cube", HTFilledFluidCubeItem)
-
-    @JvmField
-    val FORGE_HAMMER: Item = registerItem("forge_hammer", HTForgeHammerItem)
-
     @JvmField
     val HEART_OF_THE_NETHER: Item = registerItem("heart_of_the_nether", itemSettings().rarity(Rarity.UNCOMMON))
 
@@ -229,9 +245,6 @@ object RagiumItems : HTContentRegister {
     @JvmField
     val RAGI_CRYSTAL_PROCESSOR: Item = registerItem("ragi_crystal_processor")
 
-    @JvmField
-    val REMOVER_DYNAMITE: Item = registerItem("remover_dynamite", HTRemoverDynamiteItem)
-
     @JvmField
     val RESIDUAL_COKE: Item = registerItem("residual_coke")
 
@@ -250,39 +263,28 @@ object RagiumItems : HTContentRegister {
     @JvmField
     val STELLA_PLATE: Item = registerItem("stella_plate")
 
-    @JvmField
-    val TRADER_CATALOG: Item = registerItem("trader_catalog", HTTraderCatalogItem)
-
     @JvmField
     val WARPED_CRYSTAL: Item = registerItem("warped_crystal", HTWarpedCrystalItem)
 
     @JvmField
     val MISC: List<Item> = listOf(
-        BACKPACK,
         BASALT_MESH,
-        CRAFTER_HAMMER,
         CRIMSON_CRYSTAL,
         DEEPANT,
-        DYNAMITE,
-        EMPTY_FLUID_CUBE,
         ENGINE,
         ENGINEERING_PLASTIC_PLATE,
-        FILLED_FLUID_CUBE,
-        FORGE_HAMMER,
         HEART_OF_THE_NETHER,
         LASER_EMITTER,
         POLYMER_RESIN,
         PROCESSOR_SOCKET,
         RAGI_ALLOY_COMPOUND,
         RAGI_CRYSTAL_PROCESSOR,
-        REMOVER_DYNAMITE,
         RESIDUAL_COKE,
         SLAG,
         SOAP_INGOT,
         SOLAR_PANEL,
         SILICON_PLATE,
         STELLA_PLATE,
-        TRADER_CATALOG,
         WARPED_CRYSTAL,
     )
 }