Merge pull request #534 from MuteTiefling/e9e-the-feedbackening

E9E Feedback Fixes
EnigmaticaModpacks · Jul 25, 2023 · 7b65223 · 7b65223
2 parents 82f3f14 + 6f5bb6d
commit 7b65223
Show file tree

Hide file tree

Showing 14 changed files with 214 additions and 193 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -5,6 +5,8 @@
 ### 🌟 Improvements
 
 -   Certus Quartz Blocks may now be converted straight to Flawless with the Nature's Aura pick. [\#531](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/531) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Crystal Cluster blocks may now be converted to Budding via Right Click Interaction. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Cooldown for Right Click Interactions has been reduced. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ### 🐛 Fixed Bugs
 

diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json
@@ -5,23 +5,20 @@
     "registryName": "dimensional_geode",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_asurine", "weight": 95},
-            {"block": "create:asurine", "weight": 5}
+            { "block": "create:cut_asurine", "weight": 95 },
+            { "block": "create:asurine", "weight": 5 }
         ],
         "innerShellBlocks": [
-            {"block": "create:asurine", "weight": 65},
-            {"block": "emendatusenigmatica:lapis_asurine_ore", "weight": 25},
-            {"block": "emendatusenigmatica:diamond_asurine_ore", "weight": 25}
+            { "block": "create:asurine", "weight": 65 },
+            { "block": "emendatusenigmatica:lapis_asurine_ore", "weight": 25 },
+            { "block": "emendatusenigmatica:diamond_asurine_ore", "weight": 25 }
         ],
         "innerBlocks": [
-            {"block": "emendatusenigmatica:dimensional_cluster_shard_block", "weight": 60},
-            {"block": "emendatusenigmatica:budding_dimensional", "weight": 40}
+            { "block": "emendatusenigmatica:dimensional_cluster_shard_block", "weight": 60 },
+            { "block": "emendatusenigmatica:budding_dimensional", "weight": 40 }
         ],
-        "clusters": [
-            "emendatusenigmatica:small_dimensional_bud",
-            "emendatusenigmatica:medium_dimensional_bud"
-        ],
-        "fillBlocks": [{"block": "minecraft:air", "weight": 10}],
+        "clusters": ["emendatusenigmatica:small_dimensional_bud", "emendatusenigmatica:medium_dimensional_bud"],
+        "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }],
         "chance": 20,
         "rarity": "rare",
         "crackChance": 0.25,
@@ -49,4 +46,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/...apper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json b/...apper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json
@@ -1,35 +1,33 @@
 {
     "type": "emendatusenigmatica:geode_deposit",
     "dimension": "minecraft:overworld",
-    "biomes": [
-        "minecraft:dripstone_caves"
-    ],
+    "biomes": ["minecraft:dripstone_caves"],
     "registryName": "emerald_geode_caves",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_dripstone", "weight": 85},
-            {"block": "minecraft:dripstone_block", "weight": 15},
-            {"block": "minecraft:obsidian", "weight": 100}
+            { "block": "create:cut_dripstone", "weight": 85 },
+            { "block": "minecraft:dripstone_block", "weight": 15 },
+            { "block": "minecraft:obsidian", "weight": 100 }
         ],
         "innerShellBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 65},
-            {"block": "create:cut_dripstone", "weight": 15},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20}
+            { "block": "minecraft:dripstone_block", "weight": 65 },
+            { "block": "create:cut_dripstone", "weight": 15 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 }
         ],
         "innerBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore","weight": 15},
-            {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 },
+            { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15 }
         ],
         "fillBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 55},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15},
-            {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 30}
+            { "block": "minecraft:dripstone_block", "weight": 55 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15 },
+            { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 30 }
         ],
         "clusters": [],
         "chance": 20,
         "rarity": "rare",
-        "crackChance": 0.20,
+        "crackChance": 0.2,
         "minYLevel": -60,
         "maxYLevel": 70,
         "generateSamples": false,
@@ -54,4 +52,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/...figswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json b/...figswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json
@@ -10,31 +10,31 @@
         "minecraft:jagged_peaks",
         "minecraft:stony_peaks",
         "minecraft:snowy_slopes",
-        "byg:canadian_shield", 
-        "byg:crag_gardens", 
-        "byg:dacite_ridges", 
+        "byg:canadian_shield",
+        "byg:crag_gardens",
+        "byg:dacite_ridges",
         "byg:howling_peaks"
     ],
     "registryName": "emerald_geode_hills_high",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_dripstone", "weight": 85},
-            {"block": "minecraft:dripstone_block", "weight": 15}
+            { "block": "create:cut_dripstone", "weight": 85 },
+            { "block": "minecraft:dripstone_block", "weight": 15 }
         ],
         "innerShellBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "create:cut_dripstone", "weight": 20},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 10}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "create:cut_dripstone", "weight": 20 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 10 }
         ],
         "innerBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 60},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 25},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15}
+            { "block": "minecraft:dripstone_block", "weight": 60 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 25 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15 }
         ],
         "fillBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 55},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 35},
-            {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 10}
+            { "block": "minecraft:dripstone_block", "weight": 55 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 35 },
+            { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 10 }
         ],
         "clusters": [],
         "chance": 20,
@@ -43,9 +43,7 @@
         "minYLevel": 20,
         "maxYLevel": 75,
         "generateSamples": true,
-        "sampleBlocks": [
-            { "material": "emerald", "weight": 10, "strata": "minecraft_dripstone"}
-        ],
+        "sampleBlocks": [{ "material": "emerald", "weight": 10, "strata": "minecraft_dripstone" }],
         "fillerTypes": [
             "minecraft_deepslate",
             "minecraft_tuff",
@@ -66,4 +64,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/...nfigswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json b/...nfigswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json
@@ -10,31 +10,31 @@
         "minecraft:jagged_peaks",
         "minecraft:stony_peaks",
         "minecraft:snowy_slopes",
-        "byg:canadian_shield", 
-        "byg:crag_gardens", 
-        "byg:dacite_ridges", 
+        "byg:canadian_shield",
+        "byg:crag_gardens",
+        "byg:dacite_ridges",
         "byg:howling_peaks"
     ],
     "registryName": "emerald_geode_hills_low",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_dripstone", "weight": 85},
-            {"block": "minecraft:dripstone_block", "weight": 15}
+            { "block": "create:cut_dripstone", "weight": 85 },
+            { "block": "minecraft:dripstone_block", "weight": 15 }
         ],
         "innerShellBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "create:cut_dripstone", "weight": 15},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "create:cut_dripstone", "weight": 15 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 }
         ],
         "innerBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10 }
         ],
         "fillBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 55},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25},
-            {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 25}
+            { "block": "minecraft:dripstone_block", "weight": 55 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25 },
+            { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 25 }
         ],
         "clusters": [],
         "chance": 20,
@@ -64,4 +64,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/...g/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json b/...g/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json
@@ -11,24 +11,24 @@
     "registryName": "emerald_geode_swamp",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_dripstone", "weight": 85},
-            {"block": "minecraft:dripstone_block", "weight": 15},
-            {"block": "minecraft:obsidian", "weight": 100}
+            { "block": "create:cut_dripstone", "weight": 85 },
+            { "block": "minecraft:dripstone_block", "weight": 15 },
+            { "block": "minecraft:obsidian", "weight": 100 }
         ],
         "innerShellBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "create:cut_dripstone", "weight": 15},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "create:cut_dripstone", "weight": 15 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 }
         ],
         "innerBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 70},
-            {"block": "emendatusenigmatica:lapis_dripstone_ore","weight": 20},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10}
+            { "block": "minecraft:dripstone_block", "weight": 70 },
+            { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10 }
         ],
         "fillBlocks": [
-            {"block": "minecraft:dripstone_block", "weight": 60},
-            {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25},
-            {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15}
+            { "block": "minecraft:dripstone_block", "weight": 60 },
+            { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25 },
+            { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15 }
         ],
         "clusters": [],
         "chance": 20,
@@ -58,4 +58,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json
@@ -5,23 +5,20 @@
     "registryName": "fluorite_geode",
     "config": {
         "outerShellBlocks": [
-            {"block": "create:cut_asurine", "weight": 95},
-            {"block": "create:asurine", "weight": 5}
+            { "block": "create:cut_asurine", "weight": 95 },
+            { "block": "create:asurine", "weight": 5 }
         ],
         "innerShellBlocks": [
-            {"block": "create:asurine", "weight": 45},
-            {"block": "emendatusenigmatica:apatite_asurine_ore", "weight": 30},
-            {"block": "emendatusenigmatica:niter_asurine_ore", "weight": 25}
+            { "block": "create:asurine", "weight": 45 },
+            { "block": "emendatusenigmatica:apatite_asurine_ore", "weight": 30 },
+            { "block": "emendatusenigmatica:niter_asurine_ore", "weight": 25 }
         ],
         "innerBlocks": [
-            {"block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 60},
-            {"block": "emendatusenigmatica:budding_fluorite", "weight": 40}
+            { "block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 60 },
+            { "block": "emendatusenigmatica:budding_fluorite", "weight": 40 }
         ],
-        "clusters": [
-            "emendatusenigmatica:small_fluorite_bud",
-            "emendatusenigmatica:medium_fluorite_bud"
-        ],
-        "fillBlocks": [{"block": "minecraft:air", "weight": 10}],
+        "clusters": ["emendatusenigmatica:small_fluorite_bud", "emendatusenigmatica:medium_fluorite_bud"],
+        "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }],
         "chance": 30,
         "rarity": "rare",
         "crackChance": 0.15,
@@ -48,4 +45,4 @@
             "quark_shale"
         ]
     }
-}
+}
diff --git a/...configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json b/...configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json
@@ -4,24 +4,19 @@
     "biomes": [],
     "registryName": "fluorite_geode_nether",
     "config": {
-        "outerShellBlocks": [
-            {"block": "minecraft:blackstone", "weight": 95}
-        ],
+        "outerShellBlocks": [{ "block": "minecraft:blackstone", "weight": 95 }],
         "innerShellBlocks": [
-            {"block": "minecraft:basalt", "weight": 40},
-            {"block": "emendatusenigmatica:uranium_basalt_ore", "weight": 30},
-            {"block": "emendatusenigmatica:osmium_basalt_ore", "weight": 20},
-            {"block": "emendatusenigmatica:lead_basalt_ore", "weight": 10}
+            { "block": "minecraft:basalt", "weight": 40 },
+            { "block": "emendatusenigmatica:gold_basalt_ore", "weight": 30 },
+            { "block": "emendatusenigmatica:silver_basalt_ore", "weight": 20 },
+            { "block": "emendatusenigmatica:tin_basalt_ore", "weight": 10 }
         ],
         "innerBlocks": [
-            {"block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 75},
-            {"block": "emendatusenigmatica:budding_fluorite", "weight": 25}
-        ],
-        "clusters": [
-            "emendatusenigmatica:small_fluorite_bud",
-            "emendatusenigmatica:medium_fluorite_bud"
+            { "block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 75 },
+            { "block": "emendatusenigmatica:budding_fluorite", "weight": 25 }
         ],
-        "fillBlocks": [{"block": "minecraft:air", "weight": 10}],
+        "clusters": ["emendatusenigmatica:small_fluorite_bud", "emendatusenigmatica:medium_fluorite_bud"],
+        "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }],
         "chance": 30,
         "rarity": "rare",
         "crackChance": 0.25,
@@ -40,4 +35,4 @@
             "minecraft_soul_soil"
         ]
     }
-}
+}
diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json
@@ -16,20 +16,18 @@
     ],
     "registryName": "ocean_geode",
     "config": {
-        "outerShellBlocks": [
-            {"block": "quark:shale", "weight": 100}
-        ],
+        "outerShellBlocks": [{ "block": "quark:shale", "weight": 100 }],
         "innerShellBlocks": [
-            {"block": "quark:shale", "weight": 70},
-            {"block": "minecraft:prismarine", "weight": 15},
-            {"block": "emendatusenigmatica:gold_shale_ore", "weight": 15}
+            { "block": "quark:shale", "weight": 70 },
+            { "block": "minecraft:prismarine", "weight": 15 },
+            { "block": "emendatusenigmatica:gold_shale_ore", "weight": 15 }
         ],
         "innerBlocks": [
-            {"block": "minecraft:prismarine", "weight": 65},
-            {"block": "minecraft:prismarine_bricks", "weight": 25},
-            {"block": "minecraft:sea_lantern", "weight": 10}
+            { "block": "minecraft:prismarine", "weight": 65 },
+            { "block": "minecraft:prismarine_bricks", "weight": 25 },
+            { "block": "minecraft:sea_lantern", "weight": 10 }
         ],
-        "fillBlocks": [{"block": "minecraft:water", "weight": 10}],
+        "fillBlocks": [{ "block": "minecraft:water", "weight": 10 }],
         "clusters": [],
         "chance": 30,
         "rarity": "rare",
@@ -60,4 +58,4 @@
             "quark_shale"
         ]
     }
-}
+}