From 5764fb940eb7171f0a67846d605e5ae67575f87a Mon Sep 17 00:00:00 2001 From: htmlcsjs <46023024+htmlcsjs@users.noreply.github.com> Date: Fri, 3 Oct 2025 07:23:18 +0100 Subject: [PATCH] Deprecate Ender Storage (#143) --- .../quests/chapters/ev__extreme_voltage.snbt | 31 +++++++++++++++---- index.toml | 6 ++-- kubejs/client_scripts/tooltips.js | 4 +++ kubejs/server_scripts/ender_storage.js | 22 +++++-------- pack.toml | 2 +- 5 files changed, 40 insertions(+), 25 deletions(-) diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index e35ba92..7ed12f4 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -1035,21 +1035,40 @@ "16B735F9C391D260" ] description: [ - "In lieu of GTCEu's &3Ender Fluid Links&r being fully implemented, &dEnder Storage&r makes its way into the pack." + "&aEnder Fluid Link Covers&r are &dGregTech&r's &r&3Ender Tanks&r. Each Cover sends fluids through a frequency defined by an &68-digit hexadecimal number&r (0-9, then A-F for each digit). That gives you &64.29 billion&r channels to work with! Ender fluid Link Covers work as long as their chunk is loaded - regardless of distance or dimension." "" - "Recipes have been adjusted to a &asimilar tier&r. You can change the \"frequency\" of &6each tank&r by using dye on the wool pads on top." + "Setting the mode to Import will &o&c&opull&r fluids from the world location it is attached to, while Export will &o&9&opush&r fluids to the world. Each channel has a buffer of &d64 buckets&r." "" - "You can also make similar &3Ender Chests&r to transport items - which is nice, because there's currently &cno way&r to wirelessly transport items in base &bGTCEu&r! Don't ever say we don't treat you!" + "You can also make similar &3Ender Item Link Covers&r to transport items, these have the same mechanics as the fluid ones. Craft any of them to complete this quest" "" - "Lastly, using a &eDiamond&r on an Ender Tank will lock the tank to your own &dprivate frequency&r, which is helpful if you're playing on a server." + "Lastly, clicking on the &eLock&r in the ui lock the cover to your own &dprivate channel&r, which is helpful if you're playing on a server." + "{@pagebreak}" + "You can assign a description to each channel in the cover, and list all of them. I recommend you set up a system to organise all those channels. I would also advise against using the default channel (FFFFFFFF) in all cases." + "" + "&l&3Lore:&r&o Before these were added to GTm, we had &dEnder Storage&r&o in the pack. If you are still using them we &lhighly&r&o recommend changing them over to the &aGregTech covers&r&o, which can be done in a crafting table." ] id: "23A7E6D95549B1F8" shape: "rsquare" size: 0.66d subtitle: "Ender? I ha- Ok, this joke is old" tasks: [{ - id: "5AAF6386B4AA7C69" - item: "enderstorage:ender_tank" + id: "063E326F5BEA79A5" + item: { + Count: 1 + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:ender_fluid_link_cover" + } + { + Count: 1b + id: "gtceu:ender_item_link_cover" + } + ] + } + } type: "item" }] title: "Ender Fluid Linking" diff --git a/index.toml b/index.toml index 375fec9..35124cb 100644 --- a/index.toml +++ b/index.toml @@ -118,7 +118,7 @@ hash = "cc7b7524a1409711280d59e9af31b93d161cb654981abb0b2ea945111734fd3d" [[files]] file = "config/ftbquests/quests/chapters/ev__extreme_voltage.snbt" -hash = "07fe5025de4ecd299a214260c8d6df1a9dd8094a7bf7a7362e59f4027270d3b0" +hash = "b90780b61e40c18101b9af99a82468cfd3283d0b6bfbb703d7cb1aab141bb3fe" [[files]] file = "config/ftbquests/quests/chapters/gtceu.snbt" @@ -534,7 +534,7 @@ hash = "2951d1ff9ee74a378ddd65660f8dac889824c2dc29c40480c749260f8871e842" [[files]] file = "kubejs/client_scripts/tooltips.js" -hash = "f6b3c13d27565e7e379d5db6872465c7a76451cf39baf9feb5649ea9258b9318" +hash = "43a07653ef7b7c9f734f6a244e78ec91fd443b47577b354a8fa3e06f02579bba" [[files]] file = "kubejs/config/client.properties" @@ -634,7 +634,7 @@ hash = "8b7f2f0a99a9e45d6d4997a99e984f0a8502916fd26b11ec3fca87df398d4d19" [[files]] file = "kubejs/server_scripts/ender_storage.js" -hash = "fff340eaab79c1b5054c16d7d0ef4fd2b6d977cceecb4e33f7f2a4a85f229b3e" +hash = "0684e9dcf9c752c3c7218ec71fdd37f64897aa1236de18d02b8920b908781d5f" [[files]] file = "kubejs/server_scripts/gregtech/components.js" diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index fbcd4c2..4a54913 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -32,4 +32,8 @@ ItemEvents.tooltip((event) => { event.add("ae2:controller", Text.gray("Channels are §cdisabled§7.")); event.add("expatternprovider:fishbig", Text.gray("Congratulations! You won Minecraft.")); + + event.add(["enderstorage:ender_chest", "enderstorage:ender_tank", "enderstorage:ender_pouch"], + Text.red("WARNING: These are deprcated and will be removed in a future update.\nPlease convert them into the GT covers in a crafting table.") + ); }); diff --git a/kubejs/server_scripts/ender_storage.js b/kubejs/server_scripts/ender_storage.js index 14e8d45..a9bec53 100644 --- a/kubejs/server_scripts/ender_storage.js +++ b/kubejs/server_scripts/ender_storage.js @@ -1,21 +1,13 @@ ServerEvents.recipes((event) => { // Ender Tank event.remove({ id: "enderstorage:ender_tank" }); - event.shaped(`enderstorage:ender_tank`, ["PEP", "STM", "PEP"], { - P: "#forge:plates/stainless_steel", - E: "#forge:plates/ender_pearl", - S: "gtceu:hv_sensor", - T: "gtceu:mv_super_tank", - M: "gtceu:hv_emitter" - }) + event.shapeless(`gtceu:ender_fluid_link_cover`, [ + "enderstorage:ender_tank" + ]); // Ender Chest event.remove({ id: "enderstorage:ender_chest" }); - event.shaped(`enderstorage:ender_chest`, ["PEP", "MTS", "PEP"], { - P: "#forge:plates/stainless_steel", - E: "#forge:plates/ender_pearl", - S: "gtceu:hv_sensor", - T: "gtceu:mv_super_chest", - M: "gtceu:hv_emitter" - }) + event.shapeless(`gtceu:ender_item_link_cover`, [ + "enderstorage:ender_chest" + ]); event.remove({ id: "enderstorage:ender_pouch" }); -}) \ No newline at end of file +}) diff --git a/pack.toml b/pack.toml index 25aefeb..9bb9a03 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "92b59557c10917e9257ebe8d13ce2539de6767daa400ca5b161bce35693be251" +hash = "eb4169464535c4bbad2b1e14201bba8ad71f63089d424793245ff77d9c38db4d" [versions] forge = "47.4.6"