From 402e6c44aeef39708189f4b28cbcfc787bcc969c Mon Sep 17 00:00:00 2001 From: Mitchell5200 <45913837+Mitchell5200@users.noreply.github.com> Date: Sun, 7 Jan 2024 10:49:59 +0800 Subject: [PATCH 1/5] Fix HNN models, again... --- .../hostilenetworks/data_models/chicken.json | 44 +++++++++++++++- .../data_models/glow_squid.json | 43 +++++++++++++++- .../data_models/mooshroom.json | 50 ++++++++++++++++++- .../hostilenetworks/data_models/squid.json | 48 +++++++++++++++++- 4 files changed, 181 insertions(+), 4 deletions(-) diff --git a/kubejs/data/hostilenetworks/data_models/chicken.json b/kubejs/data/hostilenetworks/data_models/chicken.json index 06da1a5..57c5018 100644 --- a/kubejs/data/hostilenetworks/data_models/chicken.json +++ b/kubejs/data/hostilenetworks/data_models/chicken.json @@ -1,2 +1,44 @@ { - } \ No newline at end of file + "type": "minecraft:chicken", + "subtypes": [ + "twilightforest:penguin" + ], + "name": "entity.minecraft.chicken", + "name_color": "0xf0ead6", + "gui_scale": 1.0, + "gui_x_offset": 0.0, + "gui_y_offset": 0.0, + "gui_z_offset": 0.0, + "sim_cost": 64, + "input": { + "item": "hostilenetworks:empty_prediction", + "count": 1 + }, + "base_drop": { + "item": "hostilenetworks:overworld_prediction", + "count": 1 + }, + "trivia": "hostilenetworks.trivia.chicken", + "fabricator_drops": [ + { + "item": "minecraft:chicken", + "count": 32 + }, + { + "item": "minecraft:feather", + "count": 24 + } + ], + "tier_data": [ + 6, + 54, + 354, + 1254 + ], + "data_per_kill": [ + 1, + 4, + 10, + 18 + ] +} \ No newline at end of file diff --git a/kubejs/data/hostilenetworks/data_models/glow_squid.json b/kubejs/data/hostilenetworks/data_models/glow_squid.json index 06da1a5..657fa5f 100644 --- a/kubejs/data/hostilenetworks/data_models/glow_squid.json +++ b/kubejs/data/hostilenetworks/data_models/glow_squid.json @@ -1,2 +1,43 @@ { - } \ No newline at end of file + "type": "minecraft:glow_squid", + "subtypes": [], + "name": "entity.minecraft.glow_squid", + "name_color": "0x32A1A1", + "gui_scale": 1.0, + "gui_x_offset": 0.0, + "gui_y_offset": 1, + "gui_z_offset": 0.0, + "sim_cost": 32, + "input": { + "item": "hostilenetworks:empty_prediction", + "count": 1 + }, + "base_drop": { + "item": "hostilenetworks:overworld_prediction", + "count": 1 + }, + "trivia": "hostilenetworks.trivia.glow_squid", + "fabricator_drops": [ + { + "optional": true, + "item": "croptopia:glowing_calamari", + "count": 32 + }, + { + "item": "minecraft:glow_ink_sac", + "count": 32 + } + ], + "tier_data": [ + 6, + 54, + 354, + 1254 + ], + "data_per_kill": [ + 1, + 4, + 10, + 18 + ] +} \ No newline at end of file diff --git a/kubejs/data/hostilenetworks/data_models/mooshroom.json b/kubejs/data/hostilenetworks/data_models/mooshroom.json index 06da1a5..4e30e98 100644 --- a/kubejs/data/hostilenetworks/data_models/mooshroom.json +++ b/kubejs/data/hostilenetworks/data_models/mooshroom.json @@ -1,2 +1,50 @@ { - } \ No newline at end of file + "type": "minecraft:mooshroom", + "subtypes": [], + "name": "entity.minecraft.mooshroom", + "name_color": "0xA81012", + "gui_scale": 1.0, + "gui_x_offset": 0.0, + "gui_y_offset": 0.0, + "gui_z_offset": 0.0, + "sim_cost": 64, + "input": { + "item": "hostilenetworks:empty_prediction", + "count": 1 + }, + "base_drop": { + "item": "hostilenetworks:overworld_prediction", + "count": 1 + }, + "trivia": "hostilenetworks.trivia.mooshroom", + "fabricator_drops": [ + { + "item": "minecraft:beef", + "count": 32 + }, + { + "item": "minecraft:leather", + "count": 24 + }, + { + "item": "minecraft:red_mushroom", + "count": 16 + }, + { + "item": "minecraft:brown_mushroom", + "count": 16 + } + ], + "tier_data": [ + 6, + 54, + 354, + 1254 + ], + "data_per_kill": [ + 1, + 4, + 10, + 18 + ] +} \ No newline at end of file diff --git a/kubejs/data/hostilenetworks/data_models/squid.json b/kubejs/data/hostilenetworks/data_models/squid.json index 06da1a5..ce40d70 100644 --- a/kubejs/data/hostilenetworks/data_models/squid.json +++ b/kubejs/data/hostilenetworks/data_models/squid.json @@ -1,2 +1,48 @@ { - } \ No newline at end of file + "type": "minecraft:squid", + "subtypes": [], + "name": "entity.minecraft.squid", + "name_color": "0x546D80", + "gui_scale": 1.0, + "gui_x_offset": 0.0, + "gui_y_offset": 1, + "gui_z_offset": 0.0, + "sim_cost": 32, + "input": { + "item": "hostilenetworks:empty_prediction", + "count": 1 + }, + "base_drop": { + "item": "hostilenetworks:overworld_prediction", + "count": 1 + }, + "trivia": "hostilenetworks.trivia.squid", + "fabricator_drops": [ + { + "item": "minecraft:ink_sac", + "count": 32 + }, + { + "optional": true, + "item": "croptopia:calamari", + "count": 32 + }, + { + "optional": true, + "item": "reliquary:squid_beak", + "count": 2 + } + ], + "tier_data": [ + 6, + 54, + 354, + 1254 + ], + "data_per_kill": [ + 1, + 4, + 10, + 18 + ] +} \ No newline at end of file From 149786208484da2898399996eb149bc4c2d405fd Mon Sep 17 00:00:00 2001 From: Mitchell5200 <45913837+Mitchell5200@users.noreply.github.com> Date: Sun, 7 Jan 2024 10:54:31 +0800 Subject: [PATCH 2/5] Fix Ars glyph location, Close #1801 --- .../quests/chapters/ars_nouveau.snbt | 43 +++++++------------ 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 1a3a4cd..583170c 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -5,18 +5,6 @@ group: "02FE661031A105D8" icon: "ars_nouveau:creative_spell_book" id: "6AEDA2F9BEB57759" - images: [{ - click: "" - corner: false - dev: false - height: 0.3d - hover: ["&dNeeded for the ATM Star&r"] - image: "allthetweaks:item/atm_star" - rotation: 0.0d - width: 0.3d - x: 7.5d - y: 8.5d - }] order_index: 0 quest_links: [ ] quests: [ @@ -231,7 +219,7 @@ type: "item" }] x: 0.0d - y: -9.5d + y: -8.5d } { dependencies: ["441C0659ED28D935"] @@ -316,7 +304,7 @@ type: "item" }] x: 0.0d - y: -13.5d + y: -12.5d } { dependencies: ["6F3602F5600A6221"] @@ -367,7 +355,7 @@ type: "item" }] x: 0.0d - y: -8.5d + y: -7.5d } { dependencies: ["63DD7F5A4441ACE7"] @@ -383,7 +371,7 @@ item: "ars_nouveau:glyph_dampen" type: "item" }] - x: -1.0d + x: -0.5d y: -13.5d } { @@ -419,7 +407,7 @@ type: "item" }] x: 0.0d - y: -11.5d + y: -10.5d } { dependencies: ["441C0659ED28D935"] @@ -571,7 +559,7 @@ item: "ars_nouveau:glyph_interact" type: "item" }] - x: -4.5d + x: -5.0d y: -14.5d } { @@ -626,7 +614,7 @@ y: -11.5d } { - dependencies: ["63DD7F5A4441ACE7"] + dependencies: ["441C0659ED28D935"] id: "4CAC87774C1B15C0" rewards: [{ id: "2483EB293F404A34" @@ -639,8 +627,8 @@ item: "ars_nouveau:glyph_fell" type: "item" }] - x: 0.0d - y: -7.5d + x: -4.0d + y: -14.5d } { dependencies: ["63DD7F5A4441ACE7"] @@ -656,7 +644,7 @@ item: "ars_nouveau:glyph_extend_time" type: "item" }] - x: -2.0d + x: -1.5d y: -13.5d } { @@ -792,7 +780,7 @@ item: "ars_nouveau:glyph_pickup" type: "item" }] - x: -5.5d + x: -6.0d y: -14.5d } { @@ -913,7 +901,7 @@ type: "item" }] x: 0.0d - y: -12.5d + y: -11.5d } { dependencies: ["63DD7F5A4441ACE7"] @@ -2387,14 +2375,13 @@ } ] shape: "diamond" - size: 2.0d tasks: [{ id: "5D3C989D159E191B" item: "ars_nouveau:ritual_wilden_summon" type: "item" }] x: 7.5d - y: 7.5d + y: 7.0d } { dependencies: ["457DE8C154641437"] @@ -2595,7 +2582,7 @@ type: "item" }] x: 0.0d - y: -10.5d + y: -9.5d } { dependencies: ["441C0659ED28D935"] @@ -3106,7 +3093,7 @@ "" "The &6Jar of Voiding&r destroys items you pick up in exchange for mana. This can be filtered." "" - "To add or remove an item to be destroyed by the jar, use the jar with the item in your off hand, or use an item on the Scribe's Table with the jar placed on it." + "To add or remove an item to be detroyed by the jar, use the jar with the item in your off hand, or use an item on the Scribe's Table with the jar placed on it." "" "The jar must be on your hotbar to function." ] From a76b48bdd88f8a35d8bbd32d309284758e531cb7 Mon Sep 17 00:00:00 2001 From: Mitchell5200 <45913837+Mitchell5200@users.noreply.github.com> Date: Sun, 7 Jan 2024 11:02:53 +0800 Subject: [PATCH 3/5] Change terminalStoragePacketMaxInstances, Close #1798 --- config/integratedterminals-common.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/integratedterminals-common.toml b/config/integratedterminals-common.toml index e0fd4aa..1700a83 100644 --- a/config/integratedterminals-common.toml +++ b/config/integratedterminals-common.toml @@ -61,7 +61,9 @@ #The number of threads that the crafting plan calculator can use. craftingPlannerThreads = 2 #The maximum number of terminal storage instances that can be sent in a single packet. Reduce this when you have packet overflows. - terminalStoragePacketMaxInstances = 1024 + terminalStoragePacketMaxInstances = 256 #If the version checker should be enabled. versionChecker = false + #The maximum number of terminal storage crafting recipes that can be sent in a single packet. Reduce this when you have packet overflows. + terminalStoragePacketMaxRecipes = 128 From f71d61f6c05f73638937074b435d4865ee7643c3 Mon Sep 17 00:00:00 2001 From: Mitchell5200 <45913837+Mitchell5200@users.noreply.github.com> Date: Sun, 7 Jan 2024 17:39:45 +0800 Subject: [PATCH 4/5] AE2, Dense to regular backcraft --- kubejs/server_scripts/mods/ae/recipes.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/server_scripts/mods/ae/recipes.js b/kubejs/server_scripts/mods/ae/recipes.js index 00641d6..8e91b33 100644 --- a/kubejs/server_scripts/mods/ae/recipes.js +++ b/kubejs/server_scripts/mods/ae/recipes.js @@ -6,4 +6,8 @@ ServerEvents.recipes(event => { E: '#forge:plates/enderium', N: 'minecraft:netherite_ingot' }).id('kubejs:aeinfinitybooster/infinity_card') + + event.shapeless(` 4x ae2:fluix_covered_cable`,[`ae2:fluix_covered_dense_cable`]).id(`kubejs:ae2/dense_to_normal`) + event.shapeless(` 4x ae2:fluix_smart_cable`,[`ae2:fluix_smart_dense_cable`]).id(`kubejs:ae2/smart_dense_to_smart_normal`) + }) From a2f1fc198288c2d6ab03976d3822da186cb201aa Mon Sep 17 00:00:00 2001 From: Mitchell5200 <45913837+Mitchell5200@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:24:27 +0800 Subject: [PATCH 5/5] Update conflicts.js, remove incorrect DD recipes that are fixed in 1.20 --- kubejs/server_scripts/conflicts.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kubejs/server_scripts/conflicts.js b/kubejs/server_scripts/conflicts.js index aabfe57..1cef5e9 100644 --- a/kubejs/server_scripts/conflicts.js +++ b/kubejs/server_scripts/conflicts.js @@ -216,6 +216,15 @@ ServerEvents.recipes(event => { event.remove({id: 'functionalstorage:oak_drawer_alternate_x1'}) event.remove({id: 'functionalstorage:oak_drawer_alternate_x2'}) event.remove({id: 'functionalstorage:oak_drawer_alternate_x4'}) + + // Incorrect ore smelting/blasting output, fixed in 1.20 of DeeperDarker + event.remove({id: 'deeperdarker:raw_iron_from_blasting_gloomslate_iron_ore'}) + event.remove({id: 'deeperdarker:raw_gold_from_blasting_gloomslate_gold_ore'}) + event.remove({id: 'deeperdarker:raw_copper_from_blasting_gloomslate_copper_ore'}) + event.remove({id: 'deeperdarker:raw_iron_from_smelting_gloomslate_iron_ore'}) + event.remove({id: 'deeperdarker:raw_gold_from_smelting_gloomslate_gold_ore'}) + event.remove({id: 'deeperdarker:raw_copper_from_smelting_gloomslate_copper_ore'}) + }) // convert abd blocks to quark on break