Aluminum: Fixed some models, added crafting recipes, added ~~chicken~…

…~ aluminum nuggets and aluminum ore blocks

src/main/java/io/github/teampropulsive/Blocks.java

@@ -21,6 +21,9 @@ public class Blocks {
     public static final Block ALUMINUM_BLOCK = new Block(
             FabricBlockSettings.create().requiresTool().strength(5.0f, 6.0f).requiresTool()
     );
+    public static final Block ALUMINUM_ORE_BLOCK = new Block(
+            FabricBlockSettings.create().requiresTool().strength(5.0f, 6.0f).requiresTool()
+    );
     public static final Block ANORTHOSITE = new Block(
             FabricBlockSettings.create().requiresTool().strength(5.0f, 11.0f)
     );
@@ -30,6 +33,7 @@ public static void register() {
         registerBlock(ANORTHOSITE, "anorthosite");
 
         registerBlock(ALUMINUM_BLOCK, "aluminum_block");
+        registerBlock(ALUMINUM_ORE_BLOCK, "aluminum_ore_block");
         registerBlock(ALUMINUM_ORE, "aluminum_ore");
         registerBlock(ALUMINUM_DEEPSLATE_ORE, "aluminum_deepslate_ore");
     }

src/main/java/io/github/teampropulsive/Items.java

@@ -16,6 +16,7 @@ public class Items {
     public static final Item OXYGEN_CANISTER = new GasCanister(new FabricItemSettings(), Propulsive.id("gas/oxygen"), 1000);
     public static final Item METHANE_CANISTER = new GasCanister(new FabricItemSettings(), Propulsive.id("gas/methane"), 1000);
     public static final Item HYDROGEN_CANISTER = new GasCanister(new FabricItemSettings(), Propulsive.id("gas/hydrogen"), 1000);
+    public static final Item ALUMINUM_NUGGET = new Item(new FabricItemSettings());
     public static final Item RAW_ALUMINUM = new Item(new FabricItemSettings());
     public static final Item ALUMINUM_INGOT = new Item(new FabricItemSettings());
     public static final ArmorItem SPACE_HELMET = new ArmorItem(SpaceArmorMaterial.INSTANCE, ArmorItem.Type.HELMET, new FabricItemSettings());
@@ -42,7 +43,9 @@ public static void register() {
         // Aluminum
         registerItem("raw_aluminum", RAW_ALUMINUM);
         registerItem("aluminum_ingot", ALUMINUM_INGOT);
+        registerItem("aluminum_nugget", ALUMINUM_NUGGET);
         registerBlockItem("aluminum_block", Blocks.ALUMINUM_BLOCK);
+        registerBlockItem("aluminum_ore_block", Blocks.ALUMINUM_ORE_BLOCK);
         registerBlockItem("aluminum_ore", Blocks.ALUMINUM_ORE);
         registerBlockItem("aluminum_deepslate_ore", Blocks.ALUMINUM_DEEPSLATE_ORE);
     }

src/main/java/io/github/teampropulsive/types/Planet.java

@@ -77,7 +77,6 @@ public void render() {
 
                 float planetSize = (float) this.planetSize;
 
-
                 MatrixStack matrices = context.matrixStack();
                 matrices.push();
                 matrices.translate(transformedPosition.x, transformedPosition.y, transformedPosition.z);

src/main/resources/assets/propulsive/blockstates/aluminum_ore_block.json

@@ -0,0 +1,7 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "propulsive:block/aluminum_ore_block"
+  }
+}
+

src/main/resources/assets/propulsive/models/block/aluminum_block.json

@@ -1,6 +1,7 @@
 {
-  "variants": {
-    "": { "model": "propulsive:block/aluminum_block" }
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "propulsive:block/aluminum_block"
   }
 }
 

src/main/resources/assets/propulsive/models/block/aluminum_ore_block.json

@@ -0,0 +1,7 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "propulsive:block/aluminum_ore_block"
+  }
+}
+

src/main/resources/assets/propulsive/models/item/aluminum_ingot.json

@@ -1,4 +1,6 @@
 {
-  "parent": "propulsive:block/aluminum_ingot"
-}
-
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "propulsive:item/aluminum_ingot"
+  }
+}

src/main/resources/assets/propulsive/models/item/aluminum_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "propulsive:item/aluminum_nugget"
+  }
+}

src/main/resources/assets/propulsive/models/item/aluminum_ore_block.json

@@ -0,0 +1,4 @@
+{
+  "parent": "propulsive:block/aluminum_ore_block"
+}
+

src/main/resources/assets/propulsive/models/item/raw_aluminum.json

@@ -1,4 +1,6 @@
 {
-  "parent": "propulsive:block/raw_aluminum"
-}
-
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "propulsive:item/raw_aluminum"
+  }
+}

src/main/resources/data/propulsive/recipes/aluminum_block.json

@@ -0,0 +1,36 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    },
+    {
+      "item": "propulsive:aluminum_ingot"
+    }
+  ],
+  "result": {
+    "item": "propulsive:aluminum_block",
+    "count": 1
+  }
+}

src/main/resources/data/propulsive/recipes/aluminum_ingot_block.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:aluminum_block"
+    }
+  ],
+  "result": {
+    "item": "propulsive:aluminum_ingot",
+    "count": 9
+  }
+}

src/main/resources/data/propulsive/recipes/aluminum_ingot_nugget.json

@@ -0,0 +1,36 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    },
+    {
+      "item": "propulsive:aluminum_nugget"
+    }
+  ],
+  "result": {
+    "item": "propulsive:aluminum_ingot",
+    "count": 1
+  }
+}

src/main/resources/data/propulsive/recipes/aluminum_nugget.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:aluminum_ingot"
+    }
+  ],
+  "result": {
+    "item": "propulsive:aluminum_nugget",
+    "count": 9
+  }
+}

src/main/resources/data/propulsive/recipes/raw_aluminum.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:raw_aluminum_block"
+    }
+  ],
+  "result": {
+    "item": "propulsive:raw_aluminum",
+    "count": 9
+  }
+}

src/main/resources/data/propulsive/recipes/raw_aluminum_block.json

@@ -0,0 +1,36 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    },
+    {
+      "item": "propulsive:raw_aluminum"
+    }
+  ],
+  "result": {
+    "item": "propulsive:raw_aluminum_block",
+    "count": 1
+  }
+}