Merge pull request #41 from MuteTiefling/fixes

fixes
EnigmaticaModpacks · Jul 22, 2024 · ae246d8 · ae246d8
2 parents f75bc84 + 36d8176
commit ae246d8
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,32 +1,41 @@
+### Enigmatica 10 1.5.1
+
+#### 🦟 Bugs Fixed
+
+-   Fixed issue with quest reward Scraper not accepting enchants [\#41](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/41)
+-   Removed Chiseled/chipped stonecutter compat as it is breaking occultism. Script to be revised at a later date. [\#41](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/41)
+
+---
+
 ### Enigmatica 10 1.5.0
 
 NeoForge-1.21.0-21.0.111 | [Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/changelog_mods_1.5.0.md) | [Modlist](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/modlist_1.5.0.md)
 
 #### ✔️ Added Mods
 
-  * [AE2 Dark Mode](https://www.curseforge.com/minecraft/texture-packs/ae2-dark-mode) (by [Ridanisaurus](https://www.curseforge.com/members/Ridanisaurus/projects))
-  * [AE2 Import Export Card](https://www.curseforge.com/minecraft/mc-mods/ae2-import-export-card) (by [Ultramegaaa](https://www.curseforge.com/members/Ultramegaaa/projects))
-  * [Applied Mekanistics](https://www.curseforge.com/minecraft/mc-mods/applied-mekanistics) (by [ramidzkh](https://www.curseforge.com/members/ramidzkh/projects))
-  * [Connectivity[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/connectivity) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
-  * [Cupboard](https://www.curseforge.com/minecraft/mc-mods/cupboard) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
-  * [Cursed Earth Returns](https://www.curseforge.com/minecraft/mc-mods/cursed-earth-returns) (by [nano_nestor](https://www.curseforge.com/members/nano_nestor/projects))
-  * [fix GPU memory leak[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/fix-gpu-memory-leak) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
-  * [Just Enough Archaeology](https://www.curseforge.com/minecraft/mc-mods/just-enough-archaeology) (by [LobsterJonn](https://www.curseforge.com/members/LobsterJonn/projects))
-  * [LootJS: KubeJS Addon](https://www.curseforge.com/minecraft/mc-mods/lootjs) (by [Lytho](https://www.curseforge.com/members/Lytho/projects))
-  * [Multiverse](https://www.curseforge.com/minecraft/mc-mods/multiverse) (by [davidqf555](https://www.curseforge.com/members/davidqf555/projects))
-  * [Redstone Pen](https://www.curseforge.com/minecraft/mc-mods/redstone-pen) (by [wilechaote](https://www.curseforge.com/members/wilechaote/projects))
-  * [Server Performance - Smooth Chunk Save[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/smooth-chunk-save) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
-  * [Simply Light](https://www.curseforge.com/minecraft/mc-mods/simply-light) (by [Flanks255](https://www.curseforge.com/members/Flanks255/projects))
-  * [Structure Essentials[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/structure-essentials-forge-fabric) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
+-   [AE2 Dark Mode](https://www.curseforge.com/minecraft/texture-packs/ae2-dark-mode) (by [Ridanisaurus](https://www.curseforge.com/members/Ridanisaurus/projects))
+-   [AE2 Import Export Card](https://www.curseforge.com/minecraft/mc-mods/ae2-import-export-card) (by [Ultramegaaa](https://www.curseforge.com/members/Ultramegaaa/projects))
+-   [Applied Mekanistics](https://www.curseforge.com/minecraft/mc-mods/applied-mekanistics) (by [ramidzkh](https://www.curseforge.com/members/ramidzkh/projects))
+-   [Connectivity[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/connectivity) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
+-   [Cupboard](https://www.curseforge.com/minecraft/mc-mods/cupboard) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
+-   [Cursed Earth Returns](https://www.curseforge.com/minecraft/mc-mods/cursed-earth-returns) (by [nano_nestor](https://www.curseforge.com/members/nano_nestor/projects))
+-   [fix GPU memory leak[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/fix-gpu-memory-leak) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
+-   [Just Enough Archaeology](https://www.curseforge.com/minecraft/mc-mods/just-enough-archaeology) (by [LobsterJonn](https://www.curseforge.com/members/LobsterJonn/projects))
+-   [LootJS: KubeJS Addon](https://www.curseforge.com/minecraft/mc-mods/lootjs) (by [Lytho](https://www.curseforge.com/members/Lytho/projects))
+-   [Multiverse](https://www.curseforge.com/minecraft/mc-mods/multiverse) (by [davidqf555](https://www.curseforge.com/members/davidqf555/projects))
+-   [Redstone Pen](https://www.curseforge.com/minecraft/mc-mods/redstone-pen) (by [wilechaote](https://www.curseforge.com/members/wilechaote/projects))
+-   [Server Performance - Smooth Chunk Save[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/smooth-chunk-save) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
+-   [Simply Light](https://www.curseforge.com/minecraft/mc-mods/simply-light) (by [Flanks255](https://www.curseforge.com/members/Flanks255/projects))
+-   [Structure Essentials[Forge/Fabric]](https://www.curseforge.com/minecraft/mc-mods/structure-essentials-forge-fabric) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
 
 #### ❌ Removed Mods
 
-  * [CC: Tweaked](https://www.curseforge.com/minecraft/mc-mods/cc-tweaked) (by [SquidDev](https://www.curseforge.com/members/SquidDev/projects)) (Temporarily)
-  * [Crafting on a stick](https://www.curseforge.com/minecraft/mc-mods/crafting-on-a-stick) (by [OfekN_](https://www.curseforge.com/members/OfekN_/projects))
-  * [Ding (Forge)](https://www.curseforge.com/minecraft/mc-mods/ding) (by [iChun](https://www.curseforge.com/members/iChun/projects)) (Temporarily)
-  * [FPS Reducer](https://www.curseforge.com/minecraft/mc-mods/fps-reducer) (by [bre2el](https://www.curseforge.com/members/bre2el/projects)) (Temporarily)
-  * [iChunUtil](https://www.curseforge.com/minecraft/mc-mods/ichunutil) (by [iChun](https://www.curseforge.com/members/iChun/projects)) (Temporarily)
-  * [ProbeJS](https://www.curseforge.com/minecraft/mc-mods/probejs) (by [Amygdaloideae](https://www.curseforge.com/members/Amygdaloideae/projects))
+-   [CC: Tweaked](https://www.curseforge.com/minecraft/mc-mods/cc-tweaked) (by [SquidDev](https://www.curseforge.com/members/SquidDev/projects)) (Temporarily)
+-   [Crafting on a stick](https://www.curseforge.com/minecraft/mc-mods/crafting-on-a-stick) (by [OfekN\_](https://www.curseforge.com/members/OfekN_/projects))
+-   [Ding (Forge)](https://www.curseforge.com/minecraft/mc-mods/ding) (by [iChun](https://www.curseforge.com/members/iChun/projects)) (Temporarily)
+-   [FPS Reducer](https://www.curseforge.com/minecraft/mc-mods/fps-reducer) (by [bre2el](https://www.curseforge.com/members/bre2el/projects)) (Temporarily)
+-   [iChunUtil](https://www.curseforge.com/minecraft/mc-mods/ichunutil) (by [iChun](https://www.curseforge.com/members/iChun/projects)) (Temporarily)
+-   [ProbeJS](https://www.curseforge.com/minecraft/mc-mods/probejs) (by [Amygdaloideae](https://www.curseforge.com/members/Amygdaloideae/projects))
 
 #### ⭐ Improvements
 
@@ -66,9 +75,11 @@ NeoForge-1.21.0-21.0.111 | [Mod Updates](https://github.com/EnigmaticaModpacks/E
 -   Fixed recipe conflicts between Comforts and Handcrafted [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
 -   Add all candles to the Minecraft Candles Tag [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
 -   Fix some items not appearing in Meat tags [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
+
 *   Recurring freezing with journeymap [(\#20)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/20)
 *   Foliot crusher not crushing ores [(\#19)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/19)
 *   break crafting station and get nothing back [(\#38)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/38)
+
 ---
 
 ### Enigmatica 10 1.4.0

diff --git a/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt b/config/ftbquests/quests/chapters/7F17CDF8564DCC49.snbt
@@ -23,7 +23,7 @@
 			}
 			id: "3EA53BBEBC32F813"
 			rewards: [{
-				id: "110DEBB8F8E5C966"
+				id: "725BDBD36A38F7A7"
 				item: {
 					count: 1
 					id: "geneticsresequenced:scraper"

diff --git a/kubejs/data/enigmatica/market_presets/market_trades.json b/kubejs/data/enigmatica/market_presets/market_trades.json
@@ -1 +1,5 @@
-{}
+{
+    "comment": "These are no longer used. Refer to /kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js",
+    "enabled": false,
+    "payment": { "ingredient": { "item": "minecraft:diamond" }, "count": 1 }
+}
diff --git a/kubejs/data/occultism/market_presets/market_trades.json b/kubejs/data/occultism/market_presets/market_trades.json
@@ -1 +1,5 @@
-{}
+{
+    "comment": "These are no longer used. Refer to /kubejs/server_scripts/recipes/farmingforblockheads/market_presets.js",
+    "enabled": false,
+    "payment": { "ingredient": { "item": "minecraft:diamond" }, "count": 1 }
+}
diff --git a/kubejs/server_scripts/recipes/minecraft/stonecutting.js b/kubejs/server_scripts/recipes/minecraft/stonecutting.js
@@ -4,20 +4,20 @@ ServerEvents.recipes((event) => {
     const recipes = [];
 
     // Tag conversion
-    let conversion_types = [];
-    conversion_types = conversion_types.concat(chipped_types).concat(chisel_types);
+    // let conversion_types = [];
+    // conversion_types = conversion_types.concat(chipped_types).concat(chisel_types);
 
-    conversion_types.forEach((tag) => {
-        let ingredient = Ingredient.of(tag);
-        ingredient.stacks.forEach((block) => {
-            let output = block.getId();
-            recipes.push({
-                output: output,
-                input: ingredient,
-                id: `${id_prefix}${output.replace(':', '_')}_from_${tag.substring(1).replace(':', '_')}`
-            });
-        });
-    });
+    // conversion_types.forEach((tag) => {
+    //     let ingredient = Ingredient.of(tag);
+    //     ingredient.stacks.forEach((block) => {
+    //         let output = block.getId();
+    //         recipes.push({
+    //             output: output,
+    //             input: ingredient,
+    //             id: `${id_prefix}${output.replace(':', '_')}_from_${tag.substring(1).replace(':', '_')}`
+    //         });
+    //     });
+    // });
 
     recipes.forEach((recipe) => {
         event.stonecutting(recipe.output, recipe.input).id(recipe.id);

diff --git a/kubejs/server_scripts/recipes/occultism/crushing.js b/kubejs/server_scripts/recipes/occultism/crushing.js
@@ -6,18 +6,19 @@ ServerEvents.recipes((event) => {
             ingredient: { item: 'justdirethings:coal_t2' },
             ignore_crushing_multiplier: true,
             result: {
-                type: 'occultism:item',
-                id: 'minecraft:blaze_powder',
+                type: 'occultism:tag',
+                tag: 'c:dusts/blaze',
                 count: 6
             },
             id: `${id_prefix}blaze_powder_from_coal_t2`
         },
         {
             ingredient: { tag: 'c:rods/blaze' },
             ignore_crushing_multiplier: true,
+
             result: {
-                type: 'occultism:item',
-                id: 'minecraft:blaze_powder',
+                type: 'occultism:tag',
+                tag: 'c:dusts/blaze',
                 count: 4
             },
             id: `occultism:crushing/blaze_powder_from_rod`