More Ores

src/main/generated/assets/acesbs/blockstates/endtropy_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "acesbs:block/endtropy_ore"
+    }
+  }
+}

src/main/generated/assets/acesbs/blockstates/infernal_ashes_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "acesbs:block/infernal_ashes_ore"
+    }
+  }
+}

src/main/generated/assets/acesbs/models/block/endtropy_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "acesbs:block/endtropy_ore"
+  }
+}

src/main/generated/assets/acesbs/models/block/infernal_ashes_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "acesbs:block/infernal_ashes_ore"
+  }
+}

src/main/generated/assets/acesbs/models/item/endtropy_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "acesbs:block/endtropy_ore"
+}

src/main/generated/assets/acesbs/models/item/infernal_ashes_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "acesbs:block/infernal_ashes_ore"
+}

src/main/generated/data/acesbs/advancement/recipes/misc/stable_entropy_from_blasting_endtropy_ore.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_endtropy_ore": {
+      "conditions": {
+        "items": [
+          {
+            "items": "acesbs:endtropy_ore"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "acesbs:stable_entropy_from_blasting_endtropy_ore"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_endtropy_ore"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "acesbs:stable_entropy_from_blasting_endtropy_ore"
+    ]
+  }
+}

src/main/generated/data/acesbs/loot_table/blocks/deepslate_entropy_ore.json

@@ -23,7 +23,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "acesbs:entropy_ore"
+          "name": "acesbs:deepslate_entropy_ore"
         }
       ],
       "functions": [

src/main/generated/data/acesbs/loot_table/blocks/endtropy_ore.json

@@ -0,0 +1,189 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "predicates": {
+              "minecraft:enchantments": [
+                {
+                  "enchantments": "minecraft:silk_touch",
+                  "levels": {
+                    "min": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:endtropy_ore"
+        }
+      ],
+      "functions": [
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "items": [
+              "acesbs:prisma_steel_pickaxe",
+              "acesbs:prisma_steel_hammer"
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:air",
+          "weight": 360
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal",
+          "weight": 12
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_copper",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_iron",
+          "weight": 6
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_gold",
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_lazuli",
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "items": [
+                "acesbs:prisma_steel_pickaxe",
+                "acesbs:prisma_steel_hammer"
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    }
+  ]
+}

src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_ore.json

@@ -0,0 +1,189 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "predicates": {
+              "minecraft:enchantments": [
+                {
+                  "enchantments": "minecraft:silk_touch",
+                  "levels": {
+                    "min": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:infernal_ashes_ore"
+        }
+      ],
+      "functions": [
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "items": [
+              "acesbs:prisma_steel_pickaxe",
+              "acesbs:prisma_steel_hammer"
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:air",
+          "weight": 360
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal",
+          "weight": 12
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_copper",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_iron",
+          "weight": 6
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_gold",
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_lazuli",
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "items": [
+                "acesbs:prisma_steel_pickaxe",
+                "acesbs:prisma_steel_hammer"
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    }
+  ]
+}

src/main/generated/data/acesbs/recipe/stable_entropy_from_blasting_endtropy_ore.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:blasting",
+  "category": "misc",
+  "cookingtime": 2000,
+  "experience": 0.5,
+  "group": "stable_entropy",
+  "ingredient": {
+    "item": "acesbs:endtropy_ore"
+  },
+  "result": {
+    "id": "acesbs:stable_entropy"
+  }
+}

src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -4,6 +4,8 @@
     "acesbs:stable_entropy_block",
     "acesbs:prisma_steel_block",
     "acesbs:entropy_ore",
-    "acesbs:deepslate_entropy_ore"
+    "acesbs:deepslate_entropy_ore",
+    "acesbs:infernal_ashes_ore",
+    "acesbs:endtropy_ore"
   ]
 }

src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json

@@ -2,6 +2,7 @@
   "values": [
     "acesbs:entropy_ore",
     "acesbs:deepslate_entropy_ore",
+    "acesbs:endtropy_ore",
     "acesbs:entropy_block",
     "acesbs:stable_entropy_block",
     "acesbs:prisma_steel_block"

src/main/generated/data/minecraft/tags/block/needs_iron_tool.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "acesbs:infernal_ashes_ore"
+  ]
+}

src/main/java/com/acethewildfire/acesbs/TODO.txt

@@ -1,5 +1,5 @@
 Resources
-- Infernal Ashes
+X Infernal Ashes
 - Raw End-tropy
 - Stable End-tropy
 O Prisma Steel (Stable Entropy + Iron) (Needs recipe)
@@ -22,14 +22,14 @@ Food
 - Tobacco
 
 Crop
-- Tobacco
+X Tobacco
 
 Items
 - Bubble pipe (Aquarium gravel, tobacco)
   - Pale wood + Others
 
 Armor
-- Beserker Pauldron (Special: Skeleton hurt sound)
+O Beserker Pauldron (Special: Skeleton hurt sound)
 - Wildfire Boots (Special: Rainbow ember)
 - Sov's Plate Carrier
 - (Headlamp Armors using Everburn Gold)
@@ -37,13 +37,13 @@ Armor
 - Honse armour (maybe).
 
 Potions
-- Lemon (Yellow Blindness)
+X Lemon (Yellow Blindness)
 - Faerie Size (Small and Light)
 - Bottle o' Drunken Sailor
 - Energy Drink (Hyper Sugar)
 
 Tools
-O Prisma Steel (May get a different Ore when mining)
+X Prisma Steel (May get a different Ore when mining)
 - Prisma Bucket (Stanlys bucket)
 - Chaos Silver (May get a different Ore when mining)
 - Fractal Diamond (May get a different Ore when mining)
@@ -61,13 +61,13 @@ Weapons
 - Soul Crusher (Removes Eternal Armor)
 
 Blocks
-- Deep Slate Entropy Ore
+X Deep Slate Entropy Ore
 - Block of Infernal Ashes
-- End-tropy Ore
+X End-tropy Ore
-- (Rename) Block of Raw Entropy
+X (Rename) Block of Raw Entropy
 - Block of Raw End-tropy
 - Block of Stable End-tropy
-- Blocks of (Instert Metal/Gem)
+- Blocks of (Insert Metal/Gem)
 - Decorative (Bricks)
 - Crystalized Entropy (Stained Glass version of Stable Entropy)
 
@@ -88,5 +88,5 @@ Mobs
 - Tarr Slime (Prisma and Magmacube)
 
 Music Disk
-- Crab Rave
+X Crab Rave
-- Lizard
+X Lizard

src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java

@@ -53,6 +53,22 @@ public class ModBlocks {
                             .requiresTool()
                             .sounds(BlockSoundGroup.DEEPSLATE)));
 
+    public static final Block ENDTROPY_ORE = registerBlock("endtropy_ore",
+            new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
+                   AbstractBlock.Settings.create()
+                           .mapColor(MapColor.PALE_YELLOW)
+                           .requiresTool()
+                           .strength(3.0F, 9.0F)));
+
+    public static final Block INFERNAL_ASHES_ORE = registerBlock("infernal_ashes_ore",
+            new ExperienceDroppingBlock(
+                    UniformIntProvider.create(0, 1),
+                    AbstractBlock.Settings.create()
+                            .mapColor(MapColor.DARK_RED)
+                            .requiresTool()
+                            .strength(3.0F, 3.0F)
+                            .sounds(BlockSoundGroup.NETHER_GOLD_ORE)));
+
     public static final Block STABLE_ENTROPY_BLOCK = registerBlock("stable_entropy_block",
             new StableEntropyBlock(AbstractBlock.Settings.create()
                     .strength(5f)

src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java

@@ -21,10 +21,15 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider {
                 .add(ModBlocks.STABLE_ENTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK)
                 .add(ModBlocks.ENTROPY_ORE)
-                .add(ModBlocks.DEEPSLATE_ENTROPY_ORE);
+                .add(ModBlocks.DEEPSLATE_ENTROPY_ORE)
+                .add(ModBlocks.INFERNAL_ASHES_ORE)
+                .add(ModBlocks.ENDTROPY_ORE);
+        getOrCreateTagBuilder(BlockTags.NEEDS_IRON_TOOL)
+                .add(ModBlocks.INFERNAL_ASHES_ORE);
         getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
                 .add(ModBlocks.ENTROPY_ORE)
                 .add(ModBlocks.DEEPSLATE_ENTROPY_ORE)
+                .add(ModBlocks.ENDTROPY_ORE)
                 .add(ModBlocks.ENTROPY_BLOCK)
                 .add(ModBlocks.STABLE_ENTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK);

src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java

@@ -70,7 +70,9 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider {
         addDrop(ModBlocks.LEMONWOOD_TRAPDOOR);
 
         addDrop(ModBlocks.ENTROPY_ORE, prismaSteelOreDrops(ModBlocks.ENTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
-        addDrop(ModBlocks.DEEPSLATE_ENTROPY_ORE, prismaSteelOreDrops(ModBlocks.ENTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
+        addDrop(ModBlocks.DEEPSLATE_ENTROPY_ORE, prismaSteelOreDrops(ModBlocks.DEEPSLATE_ENTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
+        addDrop(ModBlocks.INFERNAL_ASHES_ORE, prismaSteelOreDrops(ModBlocks.INFERNAL_ASHES_ORE, ModItems.RAW_ENTROPY, 1, 3));
+        addDrop(ModBlocks.ENDTROPY_ORE, prismaSteelOreDrops(ModBlocks.ENDTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
 
         BlockStatePropertyLootCondition.Builder builder2 = BlockStatePropertyLootCondition.builder(ModBlocks.TOBACCO_CROP)
                 .properties(StatePredicate.Builder.create().exactMatch(TobaccoCrop.AGE, TobaccoCrop.MAX_AGE));

src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java

@@ -20,6 +20,8 @@ public class ModModelProvider extends FabricModelProvider {
     public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ENTROPY_ORE);
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.DEEPSLATE_ENTROPY_ORE);
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.INFERNAL_ASHES_ORE);
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ENDTROPY_ORE);
 //        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ENTROPY_BLOCK);
 //        Has a complex texture, use the default blockbench method.
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.STABLE_ENTROPY_BLOCK);

src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java

@@ -28,7 +28,7 @@ public class ModRecipeProvider extends FabricRecipeProvider {
     @Override
     public void generate(RecipeExporter recipeExporter) {
 
-        List<ItemConvertible> ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE);
+        List<ItemConvertible> ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE, ModBlocks.ENDTROPY_ORE);
 
         offerBlasting(recipeExporter, ENTROPY_SMELTABLES, RecipeCategory.MISC, ModItems.STABLE_ENTROPY, 0.5f, 2000, "stable_entropy");
 

src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java

@@ -39,6 +39,8 @@ public class ModItemGroups {
                     .entries((displayContext, entries) -> {
                         entries.add(ModBlocks.ENTROPY_ORE);
                         entries.add(ModBlocks.DEEPSLATE_ENTROPY_ORE);
+                        entries.add(ModBlocks.INFERNAL_ASHES_ORE);
+                        entries.add(ModBlocks.ENDTROPY_ORE);
                         entries.add(ModBlocks.ENTROPY_BLOCK);
                         entries.add(ModBlocks.STABLE_ENTROPY_BLOCK);
                         entries.add(ModBlocks.PRISMA_STEEL_BLOCK);

src/main/resources/assets/acesbs/lang/en_us.json

@@ -63,6 +63,8 @@
   "block.acesbs.prisma_steel_block": "Block of Prisma Steel",
   "block.acesbs.entropy_ore": "Entropic Ore",
   "block.acesbs.deepslate_entropy_ore": "Deepslate Entropic Ore",
+  "block.acesbs.infernal_ashes_ore": "Infernal Ashes Ore",
+  "block.acesbs.endtropy_ore": "Endtropic Ore",
   "block.acesbs.stable_entropy_block": "Block of Stabilized Entropy",
 
   "block.acesbs.lizard_planks": "Lizard Planks",