Merge pull request #1013 from MCTian-mi/bug-fixes

Fix some quest issues in 1.1.13
SymmetricDevs · Oct 11, 2024 · c4dfcf3 · c4dfcf3
2 parents b358484 + 3c88583
commit c4dfcf3
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 1,827 deletions.
diff --git a/config/betterquesting/DefaultQuests/Quests/0/1602093300.json b/config/betterquesting/DefaultQuests/Quests/0/1602093300.json
@@ -23,8 +23,9 @@
       "requiredItems:9": {
         "0:10": {
           "Count:3": 8,
-          "Damage:2": 1,
-          "id:8": "pyrotech:material"
+          "Damage:2": 319,
+          "OreDict:8": "fuelCoke",
+          "id:8": "gregtech:meta_gem"
         }
       },
       "taskID:8": "bq_standard:retrieval"

diff --git a/config/betterquesting/DefaultQuests/Quests/0/5.json b/config/betterquesting/DefaultQuests/Quests/0/5.json
@@ -32,6 +32,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/1/668.json b/config/betterquesting/DefaultQuests/Quests/1/668.json
@@ -31,6 +31,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {
@@ -44,7 +45,7 @@
               "Durability:3": 0,
               "HarvestLevel:3": 1,
               "Material:8": "rubber",
-              "MaxDurability:3": 256,
+              "MaxDurability:3": 255,
               "ToolSpeed:5": 4.0
             },
             "HideFlags:3": 2

diff --git a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/712.json b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/712.json
@@ -18,6 +18,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {

diff --git a/config/betterquesting/resources/supersymmetry/lang/zh_cn.lang b/config/betterquesting/resources/supersymmetry/lang/zh_cn.lang
diff --git a/groovy/postInit/gameplay/FiniteWater.groovy b/groovy/postInit/gameplay/FiniteWater.groovy
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.Event;
 event_manager.listen { BlockEvent.CreateFluidSourceEvent event ->
     World world = event.getWorld();
     BlockPos pos = event.getPos();
-    if (pos.getY() > 63) {
+    if (pos.getY() > 62) {
         event.setResult(Event.Result.DENY);
         return;
     }

diff --git a/groovy/postInit/gameplay/StartingAge.groovy b/groovy/postInit/gameplay/StartingAge.groovy
@@ -27,6 +27,14 @@ for (item in name_removals) {
     crafting.remove(item);
 }
 
+mods.jei.ingredient.yeet(
+        item('minecraft:stone_sword'),
+        item('minecraft:stone_shovel'),
+        item('minecraft:stone_pickaxe'),
+        item('minecraft:stone_axe'),
+        item('minecraft:stone_hoe')
+)
+
 crafting.replaceShapeless("gregtech:clay_ball_to_dust", metaitem('dustClay'), [
         ore('craftingToolMortar'),
         ore('ingotClay')

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
@@ -85,6 +85,11 @@ def name_removals = [
         "pyrotech:bread_dough",
         "pyrotech:straw_bed",
         "pyrotech:clay",
+        "pyrotech:stone_sword",
+        "pyrotech:stone_shovel",
+        "pyrotech:stone_pickaxe",
+        "pyrotech:stone_axe",
+        "pyrotech:stone_hoe",
         "pyrotech:cobbled_limestone",
         "pyrotech:cobbled_andesite",
         "pyrotech:cobbled_diorite",

diff --git a/groovy/postInit/mod/TravelersBackpack.groovy b/groovy/postInit/mod/TravelersBackpack.groovy
@@ -1,6 +1,6 @@
 // Recipe for the default backpack
 crafting.replaceShaped('travelersbackpack:travelers_backpack_standard', item('travelersbackpack:travelers_backpack'), [
         [item('techguns:itemshared', 77), metaitem('workbench'), item('techguns:itemshared', 77)],
-        [metaitem('large_fluid_cell.steel'), item('minecraft:chest'), metaitem('large_fluid_cell.steel')],
+        [metaitem('large_fluid_cell.steel').or(item('gregtech:machine', 1612)), item('minecraft:chest'), metaitem('large_fluid_cell.steel').or(item('gregtech:machine', 1612))],
         [item('techguns:itemshared', 77), ore('wool'), item('techguns:itemshared', 77)]
 ])
diff --git a/groovy/postInit/mod/VanillaRecipes.groovy b/groovy/postInit/mod/VanillaRecipes.groovy
@@ -15,6 +15,11 @@ def recipesToRemove = [
     'quark:gravisand',
     'quark:ender_watcher',
     'quark:redstone_inductor',
+	'minecraft:stone_sword',
+	'minecraft:stone_shovel',
+	'minecraft:stone_pickaxe',
+	'minecraft:stone_axe',
+	'minecraft:stone_hoe',
     'minecraft:fermented_spider_eye',
     'minecraft:speckled_melon',
     'minecraft:magma_cream',

diff --git a/manifest.json b/manifest.json
@@ -252,7 +252,7 @@
     },
     {
       "projectID": 629629,
-      "fileID": 5487266,
+      "fileID": 5802573,
       "required": true
     },
     {