fix #7

mrsterner · Aug 11, 2023 · 7708740 · 7708740
1 parent 49c51c7
commit 7708740
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.19.2+build.28
 loader_version=0.14.19
 
 # Mod Properties
-mod_version=1.2.4
+mod_version=1.2.5
 maven_group=dev.sterner
 archives_base_name=geocluster
 

diff --git a/src/main/generated/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/src/main/generated/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.189165875	Tags for minecraft:item
+// 1.19.2	2023-08-11T17:20:15.270656261	Tags for minecraft:item
 55bdf2f1f23aea65385fb277dc54ee724845f85f data/c/tags/items/uranium_ingots.json
 f7cd80e815358f253765edb05b429e5708b6036f data/c/tags/items/silver_nuggets.json
 848db47cb76b40c7f6eaf428596cb14286b6ef65 data/c/tags/items/aluminium_ingots.json

diff --git a/src/main/generated/.cache/55f0273cb61243ff3d2fde23212f03e66541da02 b/src/main/generated/.cache/55f0273cb61243ff3d2fde23212f03e66541da02
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.188538565	Tags for minecraft:worldgen/biome
+// 1.19.2	2023-08-11T17:20:15.268058212	Tags for minecraft:worldgen/biome
 d9ed5858de9992609f810870a5b07c039117179e data/c/tags/worldgen/biome/is_swamp.json
 9014e596ae9afe8b3918f5f87515a6541a7b5889 data/c/tags/worldgen/biome/is_mushroom.json
 f45653fdd02f79a7206281b4ffd78834da958b1e data/geocluster/tags/worldgen/biome/is_marshy.json

diff --git a/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.185105417	Tags for minecraft:block
+// 1.19.2	2023-08-11T17:20:15.275802078	Tags for minecraft:block
 8a23702b05296c8af5014d6aa6e9265ded85c7d9 data/minecraft/tags/blocks/dirt.json
 3e110dd9538ad4063fc9f7720070bc3bdb0fc2a2 data/c/tags/blocks/lead_ores.json
 21f641ed6fb0bb4d49afbde694f5bb979822878d data/c/tags/blocks/titanium_ores.json

diff --git a/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 b/src/main/generated/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6
@@ -1,2 +1,2 @@
-// 1.19.2	2023-07-26T16:33:52.186377705	Language
+// 1.19.2	2023-08-11T17:20:15.269842608	Language
 1e55fc601c51313feb636708b5cde96948f44416 assets/geocluster/lang/en_us.json
diff --git a/src/main/generated/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/main/generated/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.186598899	Recipes
+// 1.19.2	2023-08-11T17:20:15.271104727	Recipes
 adefe29cc85dc7cbf647057f60e0eae535336a8a data/geocluster/recipes/uranium_ingot_from_blasting_uranium_ore.json
 4a3b944cc425f85bbd8da601353fe4058b918c4d data/geocluster/advancements/recipes/misc/quartz_from_smelting_quartz_ore.json
 7e9d2d173986a3aee262ff777e80a23c4492c5a1 data/geocluster/recipes/silver_nugget.json

diff --git a/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 b/src/main/generated/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.185627836	Block Loot Tables
+// 1.19.2	2023-08-11T17:20:15.276171294	Block Loot Tables
 461c076315ca0b7f4c3602f5ca35c74d2e13de2d data/geocluster/loot_tables/blocks/nether_gold_ore_sample.json
 a9a9adee651c85d5512d58a11face54aee191c3f data/geocluster/loot_tables/blocks/platinum_ore_sample.json
 2dc448a685685623283c379d55196187d77b4bd1 data/geocluster/loot_tables/blocks/coal_ore_sample.json
@@ -18,6 +18,7 @@ ff345d7ff7d7dcd31d5314fcc693e86c7653f1d9 data/geocluster/loot_tables/blocks/deep
 afef182f3702656bf653be7b6111367c7ed950d6 data/geocluster/loot_tables/blocks/nickel_ore.json
 d60e744062f5aad35ef5632e84026b9557990d13 data/geocluster/loot_tables/blocks/emerald_ore_sample.json
 87b075bdb735337fb8187fb656a60c78142dbd9d data/geocluster/loot_tables/blocks/deepslate_nickel_ore.json
+7a5ca35716f279f49be2bda3f683678c44af0877 data/geocluster/loot_tables/blocks/ancient_debris_ore.json
 2d48d15e1409f62925ffec9942520dc0f0d9acf4 data/geocluster/loot_tables/blocks/deepslate_zinc_ore.json
 e3b74a362495b08e4ca881e5bcd8c19c8bc9b889 data/geocluster/loot_tables/blocks/deepslate_uranium_ore.json
 888d809627a1eb8c08b6fe950c30043051eb1108 data/geocluster/loot_tables/blocks/tin_ore.json

diff --git a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-26T16:33:52.181557843	Models
+// 1.19.2	2023-08-11T17:20:15.27740715	Models
 23d6768d1f916565af2a6edf1b1c79bc7f42e5cd assets/geocluster/blockstates/deepslate_platinum_ore.json
 1671be165d2de1d528486320c2affcf75c9f7f33 assets/geocluster/models/item/nickel_nugget.json
 6deda6b3d8978a97d67aeae835f67b46b47a0a0e assets/geocluster/models/item/uranium_ore.json
@@ -30,8 +30,8 @@ b13bd92eb32101333b2448a03f9ff55794c3f89f assets/geocluster/models/item/raw_plati
 2b976fa7c11503c94501be8d91cbe27916f383dc assets/geocluster/models/item/platinum_ingot.json
 87bed0c4f98ef584ce2b0549c6f7cb0de532b99d assets/geocluster/models/item/deepslate_platinum_ore.json
 0d0bab54a9352fc4c488e565a767148ceac71133 assets/geocluster/models/item/lead_ingot.json
-2c388fb5965575f855c92adb1516a156ca0b1e5d assets/geocluster/blockstates/quartz_ore.json
 b33b42b2921284d787884b5bdcc569902dc5d4a4 assets/geocluster/blockstates/deepslate_aluminium_ore.json
+2c388fb5965575f855c92adb1516a156ca0b1e5d assets/geocluster/blockstates/quartz_ore.json
 488e4b6f7517b03e1d0c2ae726d0d4b3471e50ec assets/geocluster/models/item/copper_nugget.json
 4d6781dad06a34dbb8c6fc4d2c4a5ef1a629345a assets/geocluster/models/block/quartz_ore.json
 7a871d17f94935ee25f6faa780d4952dd8a5298e assets/geocluster/models/item/silver_ingot.json

diff --git a/src/main/generated/data/geocluster/loot_tables/blocks/ancient_debris_ore.json b/src/main/generated/data/geocluster/loot_tables/blocks/ancient_debris_ore.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "geocluster:raw_ancient_debris"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/java/dev/sterner/geocluster/datagen/GeoclusterLootTableProvider.java b/src/main/java/dev/sterner/geocluster/datagen/GeoclusterLootTableProvider.java
@@ -44,6 +44,8 @@ protected void generateBlockLootTables() {
         this.addDrop(QUARTZ_ORE, b -> oreDrops(b, QUARTZ));
         this.addDrop(DEEPSLATE_QUARTZ_ORE, b -> oreDrops(b, QUARTZ));
 
+        this.addDrop(ANCIENT_DEBRIS_ORE, RAW_ANCIENT_DEBRIS);
+
         this.addDrop(COPPER_SAMPLE, Items.RAW_COPPER);
         this.addDrop(IRON_SAMPLE, Items.RAW_IRON);
         this.addDrop(GOLD_SAMPLE, Items.RAW_GOLD);