Fixed an issue where blocks where unminable

RealYusufIsmail-Mc-Mods · Feb 25, 2023 · 7073104 · 7073104
1 parent 1ccd365
commit 7073104
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,15 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.19.3-1.0.3] - 22/01/2922
+## [1.19.3-1.0.4] - 25/02/2023
+
+### Fixed an issue where blocks where unminable
+
+## [1.19.3-1.0.3] - 22/01/2023
 
 ## updated updateJSONURL
 
-## [1.19.3-1.0.2] - 22/01/2922
+## [1.19.3-1.0.2] - 22/01/2023
 
 ## Fixed some bugs.
 ## Added custom recipe book

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
-version = '1.19.3-1.0.3'
+version = '1.19.3-1.0.4'
 group = 'io.github.realyusufismail'
 archivesBaseName = 'bentenmod'
 
@@ -80,7 +80,7 @@ repositories {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.19.3-44.1.0'
-    implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.19.3:4.0.2')
+    implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.19.3:4.0.4')
     //Logger
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.0'
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.0'
@@ -89,7 +89,7 @@ dependencies {
     //test
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
     //core
-    implementation group: 'io.github.realyusufismail', name: 'realyusufismailcore', version: '1.19-1.0.7'
+    implementation group: 'io.github.realyusufismail', name: 'realyusufismailcore', version: '1.19-1.0.8'
 }
 
 test {

diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,12 +1,12 @@
-// 1.19.3	2022-12-23T19:31:27.867685	Registries
-c2f6b7ac2be79418bf3c5f633733cb8c97824892 data/bentenmod/worldgen/configured_feature/black_diamond_ore.json
-cfe2c6b0024c5b8aceb919a1553c7f4f830761bf data/bentenmod/worldgen/configured_feature/fire_ore.json
-070b9f96e4289c93b4710fa2c418da0b8aad417b data/bentenmod/worldgen/configured_feature/imperium_ore.json
+// 1.19.3	2023-02-25T19:18:15.727814	Registries
+90d27b0c372edd9a76a712e19c1eea0c68d7b06f data/bentenmod/worldgen/configured_feature/black_diamond_ore.json
+2daff9d59043f8481972129cd05ea0b0f3f13849 data/bentenmod/worldgen/configured_feature/fire_ore.json
+f343138b00838da5078970d619db7ba80cc96e88 data/bentenmod/worldgen/configured_feature/imperium_ore.json
 5adcfd0be87b481bb2fe584bfaa04fcb9e7341b5 data/bentenmod/worldgen/configured_feature/infinitum_ore.json
-42b3f4509bee5a44b178404ca6da8f391c93d396 data/bentenmod/worldgen/configured_feature/legendary_ore.json
-66ba84aec95477a922ca8298eaa5cf283fc92316 data/bentenmod/worldgen/configured_feature/omnitrix_ore.json
-0d677806b31f075844f7c9e65bce2c7fee9e2bb1 data/bentenmod/worldgen/configured_feature/ruby_ore.json
-6cb10c855ae52846db8b64d8b511e7133e77cdcd data/bentenmod/worldgen/configured_feature/speed_ore.json
+70167ffbbc080415db19e7820b11f07df50a3396 data/bentenmod/worldgen/configured_feature/legendary_ore.json
+819a4d1c5b587c197a06374d0bb1452d9f294b7e data/bentenmod/worldgen/configured_feature/omnitrix_ore.json
+c96242ae58ad2e6e1cfaae480bdcaf5aac845212 data/bentenmod/worldgen/configured_feature/ruby_ore.json
+234ae8f04cade09f70017925273e7f51e3a5e9d3 data/bentenmod/worldgen/configured_feature/speed_ore.json
 8cc6359510d6cf58e3362eb4f264677595f4d19e data/bentenmod/worldgen/placed_feature/black_diamond_ore.json
 99a87f5d670c56ce14c2b0b1de742234ba0cccee data/bentenmod/worldgen/placed_feature/fire_ore.json
 54e8a8963e73b1fa0d51b1ef2da7ca473b74a9c4 data/bentenmod/worldgen/placed_feature/imperium_ore.json

diff --git a/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc b/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc
@@ -1,4 +1,4 @@
-// 1.19.3	2022-12-23T08:18:27.255176	Tags for minecraft:block mod id bentenmod
+// 1.19.3	2023-02-25T19:18:57.106016	Tags for minecraft:block mod id bentenmod
 4368cd2804b35fbf3a55f6b11f75a8b2badc1334 data/forge/tags/blocks/ores.json
 48a131ac33ee139b1a834ff80a60e020fb0485d8 data/forge/tags/blocks/ores/black_diamonds.json
 d08851005d3eddbd7250441c11e13a6ad5d8d1dc data/forge/tags/blocks/ores/fire.json
@@ -14,3 +14,5 @@ bec5927ac0dc74b18fe530efa3cb48efcc4b36be data/forge/tags/blocks/storage_blocks/i
 1924a72792787b416215effb7243cd29d7451066 data/forge/tags/blocks/storage_blocks/legendary.json
 b50495b1c1cd08e4c5dbac072be63ae3b9adad0e data/forge/tags/blocks/storage_blocks/omnitrix.json
 fb48d7af9ee021759264832c387703ce73080b6a data/forge/tags/blocks/storage_blocks/speed.json
+0a2489b1d4950067db45862468d7542b2cf7ebb9 data/minecraft/tags/blocks/mineable/pickaxe.json
+0a2489b1d4950067db45862468d7542b2cf7ebb9 data/minecraft/tags/blocks/needs_diamond_tool.json
diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/black_diamond_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/black_diamond_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:black_diamond_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:black_diamond_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:black_diamond_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:black_diamond_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/fire_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/fire_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:fire_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:fire_ore"
         },
         "target": {
           "block": "minecraft:netherrack",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/imperium_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/imperium_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:imperium_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:imperium_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:imperium_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:imperium_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/legendary_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/legendary_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:legendary_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:legendary_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:legendary_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:legendary_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/omnitrix_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/omnitrix_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:omnitrix_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:omnitrix_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:omnitrix_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:omnitrix_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/ruby_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/ruby_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:ruby_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:ruby_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:ruby_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:ruby_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/bentenmod/worldgen/configured_feature/speed_ore.json b/src/generated/resources/data/bentenmod/worldgen/configured_feature/speed_ore.json
@@ -6,10 +6,7 @@
     "targets": [
       {
         "state": {
-          "Name": "bentenmod:speed_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:speed_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",
@@ -18,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "bentenmod:speed_ore",
-          "Properties": {
-            "facing": "north"
-          }
+          "Name": "bentenmod:speed_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,24 @@
+{
+  "values": [
+    "bentenmod:fire_ore",
+    "bentenmod:omnitrix_ore",
+    "bentenmod:deepslate_omnitrix_ore",
+    "bentenmod:infinitum_ore",
+    "bentenmod:ruby_ore",
+    "bentenmod:deepslate_ruby_ore",
+    "bentenmod:speed_ore",
+    "bentenmod:deepslate_speed_ore",
+    "bentenmod:imperium_ore",
+    "bentenmod:deepslate_imperium_ore",
+    "bentenmod:black_diamond_ore",
+    "bentenmod:deepslate_black_diamond_ore",
+    "bentenmod:legendary_ore",
+    "bentenmod:deepslate_legendary_ore",
+    "bentenmod:fire_block",
+    "bentenmod:omnitrix_block",
+    "bentenmod:infinitum_block",
+    "bentenmod:legendary_block",
+    "bentenmod:speed_block",
+    "bentenmod:black_diamond_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
@@ -0,0 +1,24 @@
+{
+  "values": [
+    "bentenmod:fire_ore",
+    "bentenmod:omnitrix_ore",
+    "bentenmod:deepslate_omnitrix_ore",
+    "bentenmod:infinitum_ore",
+    "bentenmod:ruby_ore",
+    "bentenmod:deepslate_ruby_ore",
+    "bentenmod:speed_ore",
+    "bentenmod:deepslate_speed_ore",
+    "bentenmod:imperium_ore",
+    "bentenmod:deepslate_imperium_ore",
+    "bentenmod:black_diamond_ore",
+    "bentenmod:deepslate_black_diamond_ore",
+    "bentenmod:legendary_ore",
+    "bentenmod:deepslate_legendary_ore",
+    "bentenmod:fire_block",
+    "bentenmod:omnitrix_block",
+    "bentenmod:infinitum_block",
+    "bentenmod:legendary_block",
+    "bentenmod:speed_block",
+    "bentenmod:black_diamond_block"
+  ]
+}
diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java b/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java
@@ -15,7 +15,7 @@ public class RecipeCategoriesInit {
     private static final RecipeType<IOmnitrixCraftingRecipe> OMNITRIX_CRAFTING_RECIPE_TYPE =
             new OmntrixCrafterShapedRecipe.Type();
 
-    private static final Supplier<RecipeBookCategories> OMNTRIX_CRAFTER = () -> RecipeBookCategories
+    public static final Supplier<RecipeBookCategories> OMNTRIX_CRAFTER = () -> RecipeBookCategories
         .create("omnitrix_crafter", new ItemStack(ItemInit.OMNITRIX.get()));
 
     public static void registerRecipeCategories(RegisterRecipeBookCategoriesEvent event) {

diff --git a/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModBlockTagsProvider.java b/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModBlockTagsProvider.java
@@ -37,6 +37,7 @@
 import io.github.realyusufismail.bentenmod.core.init.TagsInit;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.tags.BlockTags;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.data.BlockTagsProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;
@@ -103,6 +104,29 @@ protected void addTags(HolderLookup.Provider provider) {
         tag(TagsInit.Blocks.STORAGE_BLACK_DIAMOND).add(BlockInit.BLACK_DIAMOND_BLOCK.get());
         tag(Tags.Blocks.ORES).addTag(TagsInit.Blocks.STORAGE_BLACK_DIAMOND);
 
+        tag(BlockTags.MINEABLE_WITH_PICKAXE).add(BlockInit.FIRE_ORE.get(),
+                BlockInit.OMNITRIX_ORE.get(), BlockInit.DEEPSLATE_OMNITRIX_ORE.get(),
+                BlockInit.INFINITUM_ORE.get(), BlockInit.RUBY_ORE.get(),
+                BlockInit.DEEPSLATE_RUBY_ORE.get(), BlockInit.SPEED_ORE.get(),
+                BlockInit.DEEPSLATE_SPEED_ORE.get(), BlockInit.IMPERIUM_ORE.get(),
+                BlockInit.DEEPSLATE_IMPERIUM_ORE.get(), BlockInit.BLACK_DIAMOND_ORE.get(),
+                BlockInit.DEEPSLATE_BLACK_DIAMOND_ORE.get(), BlockInit.LEGENDARY_ORE.get(),
+                BlockInit.DEEPSLATE_LEGENDARY_ORE.get(), BlockInit.FIRE_BLOCK.get(),
+                BlockInit.OMNITRIX_BLOCK.get(), BlockInit.INFINITUM_BLOCK.get(),
+                BlockInit.LEGENDARY_BLOCK.get(), BlockInit.SPEED_BLOCK.get(),
+                BlockInit.BLACK_DIAMOND_BLOCK.get());
+
+        tag(BlockTags.NEEDS_DIAMOND_TOOL).add(BlockInit.FIRE_ORE.get(),
+                BlockInit.OMNITRIX_ORE.get(), BlockInit.DEEPSLATE_OMNITRIX_ORE.get(),
+                BlockInit.INFINITUM_ORE.get(), BlockInit.RUBY_ORE.get(),
+                BlockInit.DEEPSLATE_RUBY_ORE.get(), BlockInit.SPEED_ORE.get(),
+                BlockInit.DEEPSLATE_SPEED_ORE.get(), BlockInit.IMPERIUM_ORE.get(),
+                BlockInit.DEEPSLATE_IMPERIUM_ORE.get(), BlockInit.BLACK_DIAMOND_ORE.get(),
+                BlockInit.DEEPSLATE_BLACK_DIAMOND_ORE.get(), BlockInit.LEGENDARY_ORE.get(),
+                BlockInit.DEEPSLATE_LEGENDARY_ORE.get(), BlockInit.FIRE_BLOCK.get(),
+                BlockInit.OMNITRIX_BLOCK.get(), BlockInit.INFINITUM_BLOCK.get(),
+                BlockInit.LEGENDARY_BLOCK.get(), BlockInit.SPEED_BLOCK.get(),
+                BlockInit.BLACK_DIAMOND_BLOCK.get());
     }
 }
 
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -39,14 +39,14 @@ side = "BOTH"
 [[dependencies.bentenmod]]
 modId = "geckolib"
 mandatory = true
-versionRange = "[1.19.3:4.0.2,)"
+versionRange = "[1.19.3:4.0.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.bentenmod]]
 modId = "realyusufismailcore"
 mandatory = true
-versionRange = "[1.19-1.0.5,)"
+versionRange = "[1.19-1.0.8,)"
 ordering = "NONE"
 side = "BOTH"
 
diff --git a/update.json b/update.json
@@ -4,7 +4,8 @@
     "1.19.3-1.0.0" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md",
     "1.19.3-1.0.1" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md",
     "1.19.3-1.0.2" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md",
-    "1.19.3-1.0.3" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md"
+    "1.19.3-1.0.3" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md",
+    "1.19.3-1.0.4" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md"
   },
   "1.19.2" : {
     "1.19.2-1.0.0" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.2/CHANGELOG.md"
@@ -32,7 +33,7 @@
     "1.19.1-recommended" : "1.19.1-1.0.0",
     "1.19.2-latest" : "1.19.2-1.0.0",
     "1.19.2-recommended" : "1.19.2-1.0.0",
-    "1.19.3-latest" : "1.19.3-1.0.3",
-    "1.19.3-recommended" : "1.19.3-1.0.3"
+    "1.19.3-latest" : "1.19.3-1.0.4",
+    "1.19.3-recommended" : "1.19.3-1.0.4"
   }
 }