From e4b8844e5f86836155a18ac8b26dadffb8ab2ac7 Mon Sep 17 00:00:00 2001 From: "Evelyn (She/Her)" <46009144+sleepy-evelyn@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:19:10 +0000 Subject: [PATCH 01/23] Update oreTrades.json --- server/numismatics/oreTrades.json | 36 +++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/server/numismatics/oreTrades.json b/server/numismatics/oreTrades.json index cf50550..1199abf 100644 --- a/server/numismatics/oreTrades.json +++ b/server/numismatics/oreTrades.json @@ -1,6 +1,34 @@ [ - { "value": 8, "variation": 3, "item": "minecraft:copper_ingot", "name": "Copper Ingot", "limit": 20 }, - { "value": 2, "variation": 1, "item": "minecraft:iron_ingot", "name": "Iron Ingot", "limit": 12 }, - { "value": 10, "variation": 2, "item": "minecraft:gold_ingot", "name": "Gold Ingot", "limit": 20 }, - { "value": 12, "variation": 10, "item": "create:zinc_ingot", "name": "Zinc Ingot", "limit": 100 } + { + "item": "minecraft:copper_ingot", + "name": "Copper Ingot", + "amount": 12, + "value": 8, + "limit": 20, + "variation": 3 + }, + { + "item": "minecraft:iron_ingot", + "name": "Iron Ingot", + "amount": 1, + "value": 12, + "limit": 100, + "variation": 12 + }, + { + "item": "minecraft:gold_ingot", + "name": "Gold Ingot", + "amount": 2, + "value": 32, + "limit": 10, + "variation": 4 + }, + { + "item": "create:zinc_ingot", + "name": "Zinc Ingot", + "amount": 64, + "value": 12, + "variation": 10, + "limit": 100 + } ] From 5868a2e6bb6e4c1e8c7a50141b5d7faeb5fe8a78 Mon Sep 17 00:00:00 2001 From: "Evelyn (She/Her)" <46009144+sleepy-evelyn@users.noreply.github.com> Date: Fri, 15 Nov 2024 15:29:40 +0000 Subject: [PATCH 02/23] Create ores_bank.json --- server/numismatics/ores_bank.json | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 server/numismatics/ores_bank.json diff --git a/server/numismatics/ores_bank.json b/server/numismatics/ores_bank.json new file mode 100644 index 0000000..75035b4 --- /dev/null +++ b/server/numismatics/ores_bank.json @@ -0,0 +1,42 @@ +{ + "trade_cycle": 600, + "max_trades_per_cycle": 10, + "announce": true, + "blacklist": [ + { "name": "Sleepy_Evelyn", "uuid": "c31a8cfa-ecd7-4ec2-8976-cb86c8c651e2" } + ], + "trades": [ + { + "item": "minecraft:copper_ingot", + "name": "Copper Ingot", + "amount": 12, + "value": 8, + "variation": 3, + "chance": 0.1 + }, + { + "item": "minecraft:iron_ingot", + "name": "Iron Ingot", + "amount": 1, + "value": 12, + "variation": 12, + "chance": 0.15 + }, + { + "item": "minecraft:gold_ingot", + "name": "Gold Ingot", + "amount": 2, + "value": 32, + "variation": 4, + "chance": 0.5 + }, + { + "item": "create:zinc_ingot", + "name": "Zinc Ingot", + "amount": 64, + "value": 12, + "variation": 10, + "chance": 0.25 + } + ] +} From 3e0f78582c5b32476b0390b1557be233046e3f16 Mon Sep 17 00:00:00 2001 From: "Evelyn (She/Her)" <46009144+sleepy-evelyn@users.noreply.github.com> Date: Fri, 15 Nov 2024 15:33:13 +0000 Subject: [PATCH 03/23] Update ores_bank.json Switch to CamelCase --- server/numismatics/ores_bank.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/numismatics/ores_bank.json b/server/numismatics/ores_bank.json index 75035b4..4e7b660 100644 --- a/server/numismatics/ores_bank.json +++ b/server/numismatics/ores_bank.json @@ -1,6 +1,6 @@ { - "trade_cycle": 600, - "max_trades_per_cycle": 10, + "tradeCycle": 600, + "maxTradesPerCycle": 10, "announce": true, "blacklist": [ { "name": "Sleepy_Evelyn", "uuid": "c31a8cfa-ecd7-4ec2-8976-cb86c8c651e2" } From ac7197b114c4027fec444b5c77f9484e04432fc2 Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Wed, 20 Nov 2024 15:50:18 -0800 Subject: [PATCH 04/23] fixing a bit of code --- index.toml | 24 +++- kubejs/server_scripts/relics.js | 121 ++++++++++++++++++ .../startup_scripts/vivvys_arcane_arsenal.js | 26 ++-- pack.toml | 2 +- 4 files changed, 158 insertions(+), 15 deletions(-) diff --git a/index.toml b/index.toml index d2769cc..5311dfd 100644 --- a/index.toml +++ b/index.toml @@ -365,6 +365,10 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" +[[files]] +file = "kubejs/assets/relics/models/CFinder.json" +hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" + [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -377,6 +381,14 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder.png" +hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" + +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder_e.png" +hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" + [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" @@ -557,6 +569,10 @@ hash = "6bc7c1a8ad7492389b931411e0d16fe0af14d246106476245851d77e5fb5775a" file = "kubejs/server_scripts/mods/phonos.js" hash = "10836165aa320bafee53924c1d14b83388231c107c38b3bdcdbf96e469cda136" +[[files]] +file = "kubejs/server_scripts/player_compass.js" +hash = "43a075aff59871a168be8148ac7d24e83f68cef713cabe9720f26afefea8d046" + [[files]] file = "kubejs/server_scripts/poly's fixes/farmersdelight.js" hash = "7b1cbd8ed4d6f49300357c128cb1bb4ca8f8002665bb23c56c036cc6f9c6a0bf" @@ -577,13 +593,17 @@ hash = "7fc60ad769e51ecd62a49c50e1e6d7d53497d931f8afb488af5eed0d438f2570" file = "kubejs/server_scripts/poly's fixes/tinkersfixes.js" hash = "d56ca08d48dc43da87d350b93a4e2a01fe8711d6ae85205a64f5a029bb7cb96e" +[[files]] +file = "kubejs/server_scripts/purgatory_chat.js" +hash = "847540cb56469ba0a1e93767843fe433ae52c7cdcb5d8cf2da1b3c39afb97fc8" + [[files]] file = "kubejs/server_scripts/recipe_removals.js" hash = "f6e82022fc644b4be24851a8efcf3ed4da3b0aa26d6948d12a2ba1a2920fc327" [[files]] file = "kubejs/server_scripts/relics.js" -hash = "73e438e4042dfa6ab37aa0948ac8e62e9989e8325a961b5abebe2be1f4e8fe8a" +hash = "aae8fabb7a802beebe767a9c2e24a3ae6d2fd1dd4cfbc0e3b5d0f4df5b5abe27" [[files]] file = "kubejs/server_scripts/smithing.js" @@ -595,7 +615,7 @@ hash = "a43bc99c4e74bf923311d6be0c3bb02e26eb997e6fb279854b0224b6c261d336" [[files]] file = "kubejs/startup_scripts/vivvys_arcane_arsenal.js" -hash = "5f1930313ff42c99a156eec2e57598060a0a6e0eab3fc1b7953a837f8cb9cf0c" +hash = "1ef00bce39552ce7d7273f49e2504b6943577192d3b68945447229e30827d57a" [[files]] file = "mods/3dskinlayers.pw.toml" diff --git a/kubejs/server_scripts/relics.js b/kubejs/server_scripts/relics.js index a13e7f0..81976a2 100644 --- a/kubejs/server_scripts/relics.js +++ b/kubejs/server_scripts/relics.js @@ -23,6 +23,18 @@ ServerEvents.customCommand((event) => { witherRocket(event.getEntity(), event.getEntity().server); } else if (id == "runicBooster"){ runicBooster(event.getEntity(), event.getEntity().server); + } else if (id == "spawnGate"){ + spawnGate(event.getEntity(), event.getEntity().server); + } else if (id == "banish"){ + banish(event.getEntity(), event.getEntity().server); + } else if (id == "summonPlayer"){ + summonPlayer(event.getEntity(), event.getEntity().server); + } else if (id == "placeNode"){ + placeNode(event.getEntity(), event.getEntity().server); + } else if (id == "yeet"){ + yeet(event.getEntity(), event.getEntity().server); + } else if (id == "impulseBooster"){ + impulseBooster(event.getEntity(), event.getEntity().server); } /** * @@ -218,5 +230,114 @@ ServerEvents.customCommand((event) => { player.boostElytraFlight(); } + /** + * + * @param {Internal.Player} player + * @param {Internal.MinecraftServer} server + */ + function spawnGate(player, server){ + var retX = player.nbt.getInt('SpawnX'); + var retY = player.nbt.getInt('SpawnY'); + var retZ = player.nbt.getInt('SpawnZ'); + teleExit(player, server); + cmd_in(player, server, "minecraft:overworld", "tp " + retX + " " + retY + " " + retZ); + teleEnter(player, server); + } + + /** + * + * @param {Internal.LivingEntity} entity + * @param {Internal.MinecraftServer} server + */ + function banish(entity, server) { + var rayHit = entity.rayTrace(64, false); + if (rayHit != null && rayHit.entity.type == "minecraft:player") { + var target = rayHit.entity; + cmd_as(target, server, "clear @s spelunkery:portal_fluid_bottle"); + cmd_as(target, server, "clear @s spelunkery:portal_fluid_bucket"); + cmd_in(target, server, "minecraft:the_end", "tp 372 64 510"); + } + } + + /** + * + * @param {Internal.LivingEntity} entity + * @param {Internal.MinecraftServer} server + */ + + function summonPlayer(entity, server){ + var summoner = entity.getProfile().getId().toString(); + var summonDim = entity.getLevel().dimension; + var offhandItem = entity.getOffhandItem(); + var skullOwner = offhandItem.getTagElement("SkullOwner"); + if (skullOwner == null || !skullOwner.hasUUID("Id")) { + return; + } + var rayHit = entity.rayTrace(64, false); + var hitX = rayHit.getHitX(); + var hitY = rayHit.getHitY(); + var hitZ = rayHit.getHitZ(); + var target = skullOwner.getUUID("Id").toString(); + + server.runCommandSilent("execute in "+summonDim+" run tp "+target+" "+hitX+" "+hitY+" "+hitZ); + } + + /** + * + * @param {Internal.LivingEntity} entity + * @param {Internal.MinecraftServer} server + */ + + function placeNode(entity, server){ + var rayHit = entity.rayTrace(256, false); + var hitX = rayHit.getHitX(); + var hitY = rayHit.getHitY(); + var hitZ = rayHit.getHitZ(); + var offhandItem = entity.getOffhandItem().getId(); + entity.tell("Trying to place " + offhandItem + " node at " + Math.ceil(hitX) + ", " + Math.ceil(hitY) + ", " + Math.ceil(hitZ)); + if (offhandItem == "create:crimsite"){ + server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:crimsite_node"); + } else if (offhandItem == "create:ochrum"){ + server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:ochrum_node") + } else if (offhandItem == "create:veridium"){ + server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:veridium_node") + } else if (offhandItem == "create:asurine"){ + server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:asurine_node") + } else { + entity.tell(Text.red("No selector item in hand!")); + } + + } + + /** + * + * @param {Internal.LivingEntity} entity + * @param {Internal.MinecraftServer} server + */ + + function yeet(entity, server){ + var rayHit = entity.rayTrace(16, false); + let speed = 50; + let motionX = entity.lookAngle.x() * speed; + let motionY = entity.lookAngle.y() * speed; + let motionZ = entity.lookAngle.z() * speed; + rayHit.entity.setMotion(motionX, motionY, motionZ); + rayHit.entity.hurtMarked = true; + } + + /** + * + * @param {Internal.LivingEntity} entity + * @param {Internal.MinecraftServer} server + */ + + function impulseBooster(entity, server){ + let speed = 1; + let motionX = entity.lookAngle.x() * speed; + let motionY = entity.lookAngle.y() * speed; + let motionZ = entity.lookAngle.z() * speed; + entity.setMotion(motionX, motionY, motionZ); + entity.hurtMarked = true; + } }) \ No newline at end of file diff --git a/kubejs/startup_scripts/vivvys_arcane_arsenal.js b/kubejs/startup_scripts/vivvys_arcane_arsenal.js index 3724133..188076c 100644 --- a/kubejs/startup_scripts/vivvys_arcane_arsenal.js +++ b/kubejs/startup_scripts/vivvys_arcane_arsenal.js @@ -31,6 +31,8 @@ StartupEvents.registry('item', e => { entity.playSound("minecraft:block.respawn_anchor.deplete", 5, 1); } }); + + e.create('inert_transport_shard') .formattedDisplayName(Component.string("Inert Transport Shard").lightPurple()) .texture('runic_shards:item/transport_inert') @@ -126,7 +128,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.amethyst_cluster.break"); useShard(_itemstack, player, _level); } else { @@ -150,7 +152,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.amethyst_cluster.break"); useShard(_itemstack, player, _level); } else { @@ -174,7 +176,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.amethyst_cluster.break"); useShard(_itemstack, player, _level); } else { @@ -198,7 +200,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.activate"); useShard(_itemstack, player, _level); } else { @@ -222,7 +224,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.activate"); useShard(_itemstack, player, _level); } else { @@ -246,7 +248,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.activate"); useShard(_itemstack, player, _level); } else { @@ -270,7 +272,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("entity.evoker.cast_spell"); useShard(_itemstack, player, _level); } else { @@ -294,7 +296,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("entity.evoker.cast_spell"); useShard(_itemstack, player, _level); } else { @@ -318,7 +320,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("entity.evoker.cast_spell"); useShard(_itemstack, player, _level); } else { @@ -342,7 +344,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.attack.target"); useShard(_itemstack, player, _level); } else { @@ -366,7 +368,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.attack.target"); useShard(_itemstack, player, _level); } else { @@ -390,7 +392,7 @@ StartupEvents.registry('item', e => { return true; }) .releaseUsing((_itemstack, _level, player, tick) => { - if (tick >= 20){ + if (tick <= 71980){ player.playSound("block.conduit.attack.target"); useShard(_itemstack, player, _level); } else { diff --git a/pack.toml b/pack.toml index e6d8121..ac372ad 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 = "bd3e70071352a5225623af31e26a5a2bdcae86ecee49af418f4807d1ee3507f0" +hash = "f2dba6a6d2c457b95940fb1084ddcc067561a2d931b9f3d0778db78d08ba8eb4" [versions] fabric = "0.16.5" From 1ffd2d1fa7ae4b900318ed9d4d54d091ea0fa34f Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Fri, 22 Nov 2024 20:19:54 -0800 Subject: [PATCH 05/23] fixed a name --- index.toml | 10 +--------- kubejs/startup_scripts/vivvys_arcane_arsenal.js | 2 +- pack.toml | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/index.toml b/index.toml index 5311dfd..78357e9 100644 --- a/index.toml +++ b/index.toml @@ -569,10 +569,6 @@ hash = "6bc7c1a8ad7492389b931411e0d16fe0af14d246106476245851d77e5fb5775a" file = "kubejs/server_scripts/mods/phonos.js" hash = "10836165aa320bafee53924c1d14b83388231c107c38b3bdcdbf96e469cda136" -[[files]] -file = "kubejs/server_scripts/player_compass.js" -hash = "43a075aff59871a168be8148ac7d24e83f68cef713cabe9720f26afefea8d046" - [[files]] file = "kubejs/server_scripts/poly's fixes/farmersdelight.js" hash = "7b1cbd8ed4d6f49300357c128cb1bb4ca8f8002665bb23c56c036cc6f9c6a0bf" @@ -593,10 +589,6 @@ hash = "7fc60ad769e51ecd62a49c50e1e6d7d53497d931f8afb488af5eed0d438f2570" file = "kubejs/server_scripts/poly's fixes/tinkersfixes.js" hash = "d56ca08d48dc43da87d350b93a4e2a01fe8711d6ae85205a64f5a029bb7cb96e" -[[files]] -file = "kubejs/server_scripts/purgatory_chat.js" -hash = "847540cb56469ba0a1e93767843fe433ae52c7cdcb5d8cf2da1b3c39afb97fc8" - [[files]] file = "kubejs/server_scripts/recipe_removals.js" hash = "f6e82022fc644b4be24851a8efcf3ed4da3b0aa26d6948d12a2ba1a2920fc327" @@ -615,7 +607,7 @@ hash = "a43bc99c4e74bf923311d6be0c3bb02e26eb997e6fb279854b0224b6c261d336" [[files]] file = "kubejs/startup_scripts/vivvys_arcane_arsenal.js" -hash = "1ef00bce39552ce7d7273f49e2504b6943577192d3b68945447229e30827d57a" +hash = "b766170cd83e82671daf07ad1151ec6d1470ed395ee07e574672de53563eaa5d" [[files]] file = "mods/3dskinlayers.pw.toml" diff --git a/kubejs/startup_scripts/vivvys_arcane_arsenal.js b/kubejs/startup_scripts/vivvys_arcane_arsenal.js index 188076c..c4d382a 100644 --- a/kubejs/startup_scripts/vivvys_arcane_arsenal.js +++ b/kubejs/startup_scripts/vivvys_arcane_arsenal.js @@ -63,7 +63,7 @@ StartupEvents.registry('item', e => { .tooltip("An inert runic shard, formatted for utility spells."); e.create('incomplete_gilded_transport_shard') - .formattedDisplayName(Component.string("Inert Transport Shard").lightPurple()) + .formattedDisplayName(Component.string("Incomplete Gilded Transport Shard").lightPurple()) .texture('runic_shards:item/transport_incomplete') .unstackable() .rarity("common") diff --git a/pack.toml b/pack.toml index ac372ad..caf467f 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 = "f2dba6a6d2c457b95940fb1084ddcc067561a2d931b9f3d0778db78d08ba8eb4" +hash = "53b5ab6afd665e02a7d274a7fbe112e91bef65c153ea908c30dbc2ca49eb0285" [versions] fabric = "0.16.5" From 00b86b6b2331f6f1737a8d4510b32f6a83b089e2 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:42:12 +0000 Subject: [PATCH 06/23] Fix Spacial Storage without removing items --- config/item_obliterator.json5 | 11 +------- index.toml | 18 ++++--------- .../ae2/tags/blocks/blacklisted/spatial.json | 26 +++++++++++++++++++ pack.toml | 2 +- 4 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 kubejs/data/ae2/tags/blocks/blacklisted/spatial.json diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5 index f88aac9..af57435 100644 --- a/config/item_obliterator.json5 +++ b/config/item_obliterator.json5 @@ -31,16 +31,7 @@ "minecraft:dragon_egg", "createaddition:creative_energy", "spelunkery:flint_hammer_and_chisel", - "spelunkery:obsidian_hammer_and_chisel", - "ae2:spatial_cell_component_2", - "ae2:spatial_cell_component_16", - "ae2:spatial_cell_component_128", - "ae2:spatial_storage_cell_2", - "ae2:spatial_storage_cell_16", - "ae2:spatial_storage_cell_128", - "ae2:spacial_pylon", - "ae2:spatial_io_port", - "ae2:spatial_anchor" + "spelunkery:obsidian_hammer_and_chisel" ], // ----------------------------------------------------------- // Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed. diff --git a/index.toml b/index.toml index e5a2323..164a6cb 100644 --- a/index.toml +++ b/index.toml @@ -78,7 +78,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b" [[files]] file = "config/item_obliterator.json5" -hash = "80959ea4544fbe8e3a62883674f3db45ec27cebf773d7df9b8f4a41902431ae6" +hash = "d1ff672be2cb2c7a384f422ecb3ed044799b421a3433a0743eb4bd550d9693ce" [[files]] file = "config/lmft.json" @@ -365,10 +365,6 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" -[[files]] -file = "kubejs/assets/relics/models/CFinder.json" -hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" - [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -381,14 +377,6 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder.png" -hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" - -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder_e.png" -hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" - [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" @@ -497,6 +485,10 @@ hash = "d93d05a3d1bad50c4d50318d0a9c1ef44d4e437a8042c7c9afb93c149bd4fdba" file = "kubejs/config/common.properties" hash = "cd5616617d0c1219c54eb85e3d56e3c0efa92fa492b0b2d4980b8b0870d264a9" +[[files]] +file = "kubejs/data/ae2/tags/blocks/blacklisted/spatial.json" +hash = "5e581581f871bb6a1c75dc884fc0662d4cde83b9b0c6a90458183818599354c0" + [[files]] file = "kubejs/data/create/recipes/crafting/curiosities/brown_toolbox.json" hash = "45d26a6d873bea2dbb9b693865225b218050b3cd61e11a3118c53c6814ed6e3c" diff --git a/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json b/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json new file mode 100644 index 0000000..b069464 --- /dev/null +++ b/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "minecraft:bedrock", + "minecraft:end_portal", + "minecraft:end_portal_frame", + "minecraft:end_gateway", + "universal_graves:visual_grave", + "universal_graves:container_grave", + "universal_graves:grave", + "ae2:creative_energy_cell", + "createaddition:creative_energy", + "createaddition:accumulator", + "create:creative_crate", + "create:creative_fluid_tank", + "create:creative_motor", + "numismatics:creative_vendor", + "armourers_workshop:skin-library-creative", + "create:fluid_tank", + "create:item_vault", + { + "id": "#c:movement_restricted", + "required": false + } + ] + } \ No newline at end of file diff --git a/pack.toml b/pack.toml index 8e723a3..1ea5c01 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 = "53b5ab6afd665e02a7d274a7fbe112e91bef65c153ea908c30dbc2ca49eb0285" +hash = "62deb88e84bc657a92366f6492c9ccf8eda308995675d483cf3229f3cb7b0b84" [versions] fabric = "0.16.5" From b034dce0b61ed02afc8efef21cdfd4e6d4968aa7 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:25:20 +0000 Subject: [PATCH 07/23] Revert "Fix Spacial Storage without removing items" This reverts commit 00b86b6b2331f6f1737a8d4510b32f6a83b089e2. --- config/item_obliterator.json5 | 11 +++++++- index.toml | 18 +++++++++---- .../ae2/tags/blocks/blacklisted/spatial.json | 26 ------------------- pack.toml | 2 +- 4 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 kubejs/data/ae2/tags/blocks/blacklisted/spatial.json diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5 index af57435..f88aac9 100644 --- a/config/item_obliterator.json5 +++ b/config/item_obliterator.json5 @@ -31,7 +31,16 @@ "minecraft:dragon_egg", "createaddition:creative_energy", "spelunkery:flint_hammer_and_chisel", - "spelunkery:obsidian_hammer_and_chisel" + "spelunkery:obsidian_hammer_and_chisel", + "ae2:spatial_cell_component_2", + "ae2:spatial_cell_component_16", + "ae2:spatial_cell_component_128", + "ae2:spatial_storage_cell_2", + "ae2:spatial_storage_cell_16", + "ae2:spatial_storage_cell_128", + "ae2:spacial_pylon", + "ae2:spatial_io_port", + "ae2:spatial_anchor" ], // ----------------------------------------------------------- // Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed. diff --git a/index.toml b/index.toml index 164a6cb..e5a2323 100644 --- a/index.toml +++ b/index.toml @@ -78,7 +78,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b" [[files]] file = "config/item_obliterator.json5" -hash = "d1ff672be2cb2c7a384f422ecb3ed044799b421a3433a0743eb4bd550d9693ce" +hash = "80959ea4544fbe8e3a62883674f3db45ec27cebf773d7df9b8f4a41902431ae6" [[files]] file = "config/lmft.json" @@ -365,6 +365,10 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" +[[files]] +file = "kubejs/assets/relics/models/CFinder.json" +hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" + [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -377,6 +381,14 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder.png" +hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" + +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder_e.png" +hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" + [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" @@ -485,10 +497,6 @@ hash = "d93d05a3d1bad50c4d50318d0a9c1ef44d4e437a8042c7c9afb93c149bd4fdba" file = "kubejs/config/common.properties" hash = "cd5616617d0c1219c54eb85e3d56e3c0efa92fa492b0b2d4980b8b0870d264a9" -[[files]] -file = "kubejs/data/ae2/tags/blocks/blacklisted/spatial.json" -hash = "5e581581f871bb6a1c75dc884fc0662d4cde83b9b0c6a90458183818599354c0" - [[files]] file = "kubejs/data/create/recipes/crafting/curiosities/brown_toolbox.json" hash = "45d26a6d873bea2dbb9b693865225b218050b3cd61e11a3118c53c6814ed6e3c" diff --git a/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json b/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json deleted file mode 100644 index b069464..0000000 --- a/kubejs/data/ae2/tags/blocks/blacklisted/spatial.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:bedrock", - "minecraft:end_portal", - "minecraft:end_portal_frame", - "minecraft:end_gateway", - "universal_graves:visual_grave", - "universal_graves:container_grave", - "universal_graves:grave", - "ae2:creative_energy_cell", - "createaddition:creative_energy", - "createaddition:accumulator", - "create:creative_crate", - "create:creative_fluid_tank", - "create:creative_motor", - "numismatics:creative_vendor", - "armourers_workshop:skin-library-creative", - "create:fluid_tank", - "create:item_vault", - { - "id": "#c:movement_restricted", - "required": false - } - ] - } \ No newline at end of file diff --git a/pack.toml b/pack.toml index 1ea5c01..8e723a3 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 = "62deb88e84bc657a92366f6492c9ccf8eda308995675d483cf3229f3cb7b0b84" +hash = "53b5ab6afd665e02a7d274a7fbe112e91bef65c153ea908c30dbc2ca49eb0285" [versions] fabric = "0.16.5" From 0efc5b4da73ea19cb27d93e2dc04ae638693f3f6 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:04:47 +0000 Subject: [PATCH 08/23] Fixes and Christmas update --- config/item_obliterator.json5 | 3 +- index.toml | 42 +++++++++++++------ kubejs/server_scripts/mods/tinkers.js | 59 +++++++++++++++++++++++++++ kubejs/server_scripts/tags.js | 12 ++++++ mods/botarium.pw.toml | 13 ++++++ mods/create-connected-fabric.pw.toml | 13 ++++++ mods/estrogen.pw.toml | 13 ++++++ mods/glitchcore.pw.toml | 13 ++++++ mods/serene-seasons.pw.toml | 13 ++++++ mods/snowy-spirit.pw.toml | 13 ++++++ pack.toml | 2 +- 11 files changed, 182 insertions(+), 14 deletions(-) create mode 100644 kubejs/server_scripts/mods/tinkers.js create mode 100644 mods/botarium.pw.toml create mode 100644 mods/create-connected-fabric.pw.toml create mode 100644 mods/estrogen.pw.toml create mode 100644 mods/glitchcore.pw.toml create mode 100644 mods/serene-seasons.pw.toml create mode 100644 mods/snowy-spirit.pw.toml diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5 index f88aac9..905d4ee 100644 --- a/config/item_obliterator.json5 +++ b/config/item_obliterator.json5 @@ -40,7 +40,8 @@ "ae2:spatial_storage_cell_128", "ae2:spacial_pylon", "ae2:spatial_io_port", - "ae2:spatial_anchor" + "ae2:spatial_anchor", + "ae2:matter_cannon" ], // ----------------------------------------------------------- // Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed. diff --git a/index.toml b/index.toml index e5a2323..321d61e 100644 --- a/index.toml +++ b/index.toml @@ -365,10 +365,6 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" -[[files]] -file = "kubejs/assets/relics/models/CFinder.json" -hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" - [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -381,14 +377,6 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder.png" -hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" - -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder_e.png" -hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" - [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" @@ -764,6 +752,11 @@ file = "mods/borderless-mining.pw.toml" hash = "c49d42cddfb05cf5e4882d5753bd98a525c9a994fda5f49651003e8266b7aa9d" metafile = true +[[files]] +file = "mods/botarium.pw.toml" +hash = "2f57caef93731338be19b1e14065978eb3e14dbfc0c1f9699dfcc2f201e2c23b" +metafile = true + [[files]] file = "mods/brewin-and-chewin-fabric.pw.toml" hash = "dda8e3884776546230530725d76d00189b1067ef3ce4ff66158d72822aa9dd1f" @@ -894,6 +887,11 @@ file = "mods/crawl.pw.toml" hash = "d3e3831377b8282db35ffe8446d535f30e011367b3187b2c96b5f179a1a77c59" metafile = true +[[files]] +file = "mods/create-connected-fabric.pw.toml" +hash = "68f1f763b3505a7765b431395c67c169f5f7ec59eca8eab2b46f5ce2397d0816" +metafile = true + [[files]] file = "mods/create-crystal-clear.pw.toml" hash = "a6d6b41fdad2ec5135d3ded6b780741c5bceda410612ba3df7a05ad4a20d0250" @@ -1049,6 +1047,11 @@ file = "mods/entitytexturefeatures.pw.toml" hash = "f74bba0bfe9e9fd9288d1afac05670ee574123cd336c4a4313a64fbccf6a62c3" metafile = true +[[files]] +file = "mods/estrogen.pw.toml" +hash = "157d7826377eefc4746e7f8037e2169a90571c3c34d4d2ce1505c7767c6fbbb9" +metafile = true + [[files]] file = "mods/expanded-storage.pw.toml" hash = "34cae8159356aa6257340c0cfa0e4f13df5ed1d9f58eb50e68062a5a4e39de88" @@ -1184,6 +1187,11 @@ file = "mods/geophilic.pw.toml" hash = "0b20ffa61c1bd741aeb720c397ea91367662d8523b421faf26081a02b8410c05" metafile = true +[[files]] +file = "mods/glitchcore.pw.toml" +hash = "493ed95320ee3cc9c2def86b9d0971c2ca4bb4215921c2a11208bee77d5dbfb5" +metafile = true + [[files]] file = "mods/hand-over-your-items.pw.toml" hash = "11483562aa9ba14ee03da7204c6edcc45a2f18ce5076aafa4ca5c2d3f6b7dc5f" @@ -1651,6 +1659,11 @@ file = "mods/searchables.pw.toml" hash = "5d694c42e5e6759807f1f5756de3dd24f098517143b8d8aac5721b7d5cf502b1" metafile = true +[[files]] +file = "mods/serene-seasons.pw.toml" +hash = "d5d7b7d8ddc60eac234033a30c8980a6d2d1ea07a0da45faabf82026432799a8" +metafile = true + [[files]] file = "mods/servercore.pw.toml" hash = "182161aa8e4b730555dd9984efb7be8cfd3debbaf1d4cc60e0b3241402e6f2bc" @@ -1671,6 +1684,11 @@ file = "mods/simple-voice-chat.pw.toml" hash = "67e281e2ddabbf5bac3768f73563f976aab05fb7392b3ce2e07fd11ac8797bc3" metafile = true +[[files]] +file = "mods/snowy-spirit.pw.toml" +hash = "c7f87fa4a0fb66266880aebfd5c1afe13e6532037cdbfd6c29ed28021977bde5" +metafile = true + [[files]] file = "mods/sodium-extra.pw.toml" hash = "5379b1da9fa50def37ede26e66dd963de3ce6f8576cd60a6b117998e09a5597c" diff --git a/kubejs/server_scripts/mods/tinkers.js b/kubejs/server_scripts/mods/tinkers.js new file mode 100644 index 0000000..801f868 --- /dev/null +++ b/kubejs/server_scripts/mods/tinkers.js @@ -0,0 +1,59 @@ +ServerEvents.recipes((event) => { + const twoIngredientAlloying = [ + ["minecraft:copper_ingot", "minecraft:gold_ingot", "tconstruct:rose_gold_ingot", 2, "heated"], + ["minecraft:amethyst_shard", "minecraft:copper_ingot", "tconstruct:amethyst_bronze_ingot", 1, "heated"], + ["tconstruct:cobalt_ingot", "minecraft:netherite_scrap", "tconstruct:manyullyn_ingot", 2, "superheated"] + ] + + const threeIngredientAlloying = [ + ["minecraft:quartz", "tconstruct:cobalt_ingot", "minecraft:copper_ingot", "tconstruct:hepatizon_ingot", 2], + ["minecraft:gold_ingot", "minecraft:magma_cream", "tconstruct:cobalt_ingot", "tconstruct:queens_slime_ingot", 1], + ] + + twoIngredientAlloying.forEach((recipe) => { + event.remove({ output: recipe[2] }); + event.custom({ + type: "create:mixing", + ingredients: [ + { + item: recipe[0] + }, + { + item: recipe[1] + } + ], + results: [ + { + item: recipe[2], + count: recipe[3] + }, + ], + heatRequirement: recipe[4] + }); + }); + + threeIngredientAlloying.forEach((recipe) => { + event.remove({ output: recipe[3] }); + event.custom({ + type: "create:mixing", + ingredients: [ + { + item: recipe[0] + }, + { + item: recipe[1] + }, + { + item: recipe[2] + } + ], + results: [ + { + item: recipe[3], + count: recipe[4] + }, + ], + heatRequirement: "superheated" + }); + }); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index f18e593..592abf1 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -71,3 +71,15 @@ ServerEvents.tags("fluid", (event) => { event.add("create:bottomless/allow", id); }); }); + +ServerEvents.tags("item", (event) => { + const ingots = ["copper", "brass", "zinc", "gold"]; + + ingots.forEach((material) => { + event.add(`forge:nuggets/${material}`, `#c:${material}_nuggets`) + event.add(`forge:ingots/${material}`, `#c:${material}_ingots`) + event.add(`forge:plates/${material}`, `#c:${material}_plates`) + event.add(`forge:blocks/${material}`, `#c:${material}_blocks`) + }); + event.add('c:silver_ingots', '#c:brass_ingots') +}); diff --git a/mods/botarium.pw.toml b/mods/botarium.pw.toml new file mode 100644 index 0000000..181f342 --- /dev/null +++ b/mods/botarium.pw.toml @@ -0,0 +1,13 @@ +name = "Botarium" +filename = "botarium-fabric-1.20.1-2.3.4.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/2u6LRnMa/versions/f3ATcSfq/botarium-fabric-1.20.1-2.3.4.jar" +hash-format = "sha512" +hash = "03589a8d05c17dbb4271c212d0eb00c53d9d5c0705f63c7816ff9e099245db71f94e7c544e323beaeac28d30bd3807eeccb1352792cb6d778ff6ecf68f4635c7" + +[update] +[update.modrinth] +mod-id = "2u6LRnMa" +version = "f3ATcSfq" diff --git a/mods/create-connected-fabric.pw.toml b/mods/create-connected-fabric.pw.toml new file mode 100644 index 0000000..daf2790 --- /dev/null +++ b/mods/create-connected-fabric.pw.toml @@ -0,0 +1,13 @@ +name = "Create: Connected Fabric" +filename = "create_connected-0.7.4-mc1.20.1+FABRIC+HOTFIX.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/QtkeMX9L/versions/S7xwyDWA/create_connected-0.7.4-mc1.20.1%2BFABRIC%2BHOTFIX.jar" +hash-format = "sha512" +hash = "0b0becf2132fb5841907c3a71bdaba11afa456f2519f0b0e7de41164ee14b89cc7562f8eb3b51d75485fdd3c9df6a712672aec9b1afb2f96cc3a476cc93547a5" + +[update] +[update.modrinth] +mod-id = "QtkeMX9L" +version = "S7xwyDWA" diff --git a/mods/estrogen.pw.toml b/mods/estrogen.pw.toml new file mode 100644 index 0000000..6d561bb --- /dev/null +++ b/mods/estrogen.pw.toml @@ -0,0 +1,13 @@ +name = "Create: Estrogen" +filename = "Estrogen-4.3.1+1.20.1-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/HhIJW8n1/versions/PiahYau4/Estrogen-4.3.1%2B1.20.1-fabric.jar" +hash-format = "sha512" +hash = "344281170505e177c451f3f89bdc11f26a45800fd199e17c80dd1204593e65440d009f1b2b1628e4e258b9e6bf09e497320d83fbe8b6b90d6ec4a8ed0bae02c3" + +[update] +[update.modrinth] +mod-id = "HhIJW8n1" +version = "PiahYau4" diff --git a/mods/glitchcore.pw.toml b/mods/glitchcore.pw.toml new file mode 100644 index 0000000..56c6347 --- /dev/null +++ b/mods/glitchcore.pw.toml @@ -0,0 +1,13 @@ +name = "GlitchCore" +filename = "GlitchCore-fabric-1.20.1-0.0.1.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/s3dmwKy5/versions/25HLOiOl/GlitchCore-fabric-1.20.1-0.0.1.1.jar" +hash-format = "sha512" +hash = "6aaf011fd04da2f2839da8e037add942588676385906d8ddad2927ca88414a37463f1b2e2ee2209a87cda8d2af9448a29e55e86ba2d94e857e46d28545ea7bbd" + +[update] +[update.modrinth] +mod-id = "s3dmwKy5" +version = "25HLOiOl" diff --git a/mods/serene-seasons.pw.toml b/mods/serene-seasons.pw.toml new file mode 100644 index 0000000..c4290b1 --- /dev/null +++ b/mods/serene-seasons.pw.toml @@ -0,0 +1,13 @@ +name = "Serene Seasons" +filename = "SereneSeasons-fabric-1.20.1-9.1.0.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/e0bNACJD/versions/4RgDk9NB/SereneSeasons-fabric-1.20.1-9.1.0.0.jar" +hash-format = "sha512" +hash = "c3a2589a61a9b156fb4a3dc27709eb5f9ebb695f1b059956e803875d864a0e89bb4f1b8698952f2e5681ee4c7eaa8e729e81eff16341afd32d2d2beeed72544a" + +[update] +[update.modrinth] +mod-id = "e0bNACJD" +version = "4RgDk9NB" diff --git a/mods/snowy-spirit.pw.toml b/mods/snowy-spirit.pw.toml new file mode 100644 index 0000000..fa5ce8c --- /dev/null +++ b/mods/snowy-spirit.pw.toml @@ -0,0 +1,13 @@ +name = "Snowy Spirit" +filename = "snowyspirit-1.20-3.0.10-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/UiFDlI7w/versions/yGrKC4Ka/snowyspirit-1.20-3.0.10-fabric.jar" +hash-format = "sha512" +hash = "f40f5fcf91ed10dff3dfdb01d02e87a725cfa69f522117c49d095173c46a96e43184f6029cedd60d3c4744002b7e85e8bf7ce9f285dcde5d5e702c10a40a1cab" + +[update] +[update.modrinth] +mod-id = "UiFDlI7w" +version = "yGrKC4Ka" diff --git a/pack.toml b/pack.toml index 8e723a3..c1411c3 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 = "53b5ab6afd665e02a7d274a7fbe112e91bef65c153ea908c30dbc2ca49eb0285" +hash = "371b5b483b49222a26bbf88be76ffb5a1a670197c87642f851657c0e267f89c4" [versions] fabric = "0.16.5" From 04da55ffbfb6bc0e1132d1a4a6507d40df1b8ac5 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:05:02 +0000 Subject: [PATCH 09/23] Refresh packwiz (oops) --- index.toml | 8 ++++++-- pack.toml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/index.toml b/index.toml index 321d61e..e64e0d8 100644 --- a/index.toml +++ b/index.toml @@ -78,7 +78,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b" [[files]] file = "config/item_obliterator.json5" -hash = "80959ea4544fbe8e3a62883674f3db45ec27cebf773d7df9b8f4a41902431ae6" +hash = "eed9ab70d89d525fa2a81b5ff3c2637dcfe132287a5be3c3223dd457ced5c4dc" [[files]] file = "config/lmft.json" @@ -557,6 +557,10 @@ hash = "e7eca84aedff32c1346213753ae790cef04be79803aa091a953065405a54d8ae" file = "kubejs/server_scripts/mods/phonos.js" hash = "0cdef75026facef7f1e3021f495cf4f11a4341e86c24c93301a2183ed9dfc2d7" +[[files]] +file = "kubejs/server_scripts/mods/tinkers.js" +hash = "1cdd7282bfc4beb43c7145da573f84403356c45ca5e01a5d8e9382af85d6fd65" + [[files]] file = "kubejs/server_scripts/poly's fixes/farmersdelight.js" hash = "7b1cbd8ed4d6f49300357c128cb1bb4ca8f8002665bb23c56c036cc6f9c6a0bf" @@ -591,7 +595,7 @@ hash = "d54f1fb3afc2f8560ee5032fe5684deee96de51e2e194fcee6f00b28c35f6c86" [[files]] file = "kubejs/server_scripts/tags.js" -hash = "d4bf020dc40f5a5d17fe1a727698114d0c14323aaae1e67fe5d23b7c8a17cd8e" +hash = "f1b788c37e03ff03bdef3181599a9fcc9c4dd4d6c010942f6042962e2cf304d1" [[files]] file = "kubejs/startup_scripts/vivvys_arcane_arsenal.js" diff --git a/pack.toml b/pack.toml index c1411c3..42d454e 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 = "371b5b483b49222a26bbf88be76ffb5a1a670197c87642f851657c0e267f89c4" +hash = "b649629d5c5bb318f73e8c40c532f6a0f95e782ee1f8e493a94aed99afb9e24b" [versions] fabric = "0.16.5" From 01da44a52049077ec2c580a5353c4bcda91161a8 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:05:32 +0000 Subject: [PATCH 10/23] Update pack.toml --- pack.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.toml b/pack.toml index 42d454e..93b8f44 100644 --- a/pack.toml +++ b/pack.toml @@ -1,6 +1,6 @@ name = "Steam 'n' Rails Modpack" author = "IThundxr" -version = "1.1.6" +version = "1.1.7" pack-format = "packwiz:1.1.0" [index] From 0353dff9a56a53998ffcc5f5432c9e30ee9e210a Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:23:29 +0000 Subject: [PATCH 11/23] More fixes --- index.toml | 13 +++ .../gameplay/sluice/lava/passive.json | 92 +++++++++++++++++++ .../gameplay/sluice/portal_fluid/passive.json | 25 +++++ mods/ns-cr-rc.pw.toml | 13 +++ pack.toml | 2 +- 5 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json create mode 100644 kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json create mode 100644 mods/ns-cr-rc.pw.toml diff --git a/index.toml b/index.toml index e64e0d8..743679f 100644 --- a/index.toml +++ b/index.toml @@ -493,6 +493,14 @@ hash = "45d26a6d873bea2dbb9b693865225b218050b3cd61e11a3118c53c6814ed6e3c" file = "kubejs/data/minecraft/recipes/shulker_box.json" hash = "ddec276786d2a9082eb9376604cccb1fce7694d9d15ce4e6bacf95ccf1c650da" +[[files]] +file = "kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json" +hash = "1988bd3fe557fce4c56e357fbf857e308868c64501c95857039667c7a1fd7255" + +[[files]] +file = "kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json" +hash = "f0ecd634b2777064b09442045b4d0ab7d02c6874b8476bb24a3abd2100928d6e" + [[files]] file = "kubejs/server_scripts/betterend/infusion.js" hash = "f49ad03ce37c2f54765a6c5a5aedd4748443871964ac6e111c397982e1a74f91" @@ -1496,6 +1504,11 @@ file = "mods/no-resource-pack-warnings.pw.toml" hash = "c8df23a6f0bd41d2f562b460e94bb3df7df1932298bf7b5081e43dfd7c270fae" metafile = true +[[files]] +file = "mods/ns-cr-rc.pw.toml" +hash = "1a6fe5303c71f2c1cd0a412caf918024e5753b9bc31661eaea38b0071f8770fe" +metafile = true + [[files]] file = "mods/nullscape.pw.toml" hash = "8d93d1db086d63d10edb0a3ad6926aeb6e6aab8985ff3a7eac1ec313ebce4420" diff --git a/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json new file mode 100644 index 0000000..f6a2afb --- /dev/null +++ b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json @@ -0,0 +1,92 @@ +{ + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "weight": 150, + "name": "spelunkery:magma_pebble" + }, + { + "type": "minecraft:item", + "weight": 10, + "name": "spelunkery:raw_gold_nugget" + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:netherite_scrap", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "biome": "minecraft:nether_wastes" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "biome": "minecraft:basalt_deltas" + } + } + ] + } + ] + }, + + { + "type": "minecraft:item", + "weight": 200, + "name": "spelunkery:netherrack_pebble" + }, + { + "type": "minecraft:item", + "weight": 100, + "name": "spelunkery:blackstone_pebble", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "biome": "minecraft:nether_wastes" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "biome": "minecraft:basalt_deltas" + } + } + ] + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:wither_skeleton_skull", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "structure": "minecraft:fortress" + } + } + ] + } + ] + } + ] + } + ] + } \ No newline at end of file diff --git a/kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json new file mode 100644 index 0000000..c25a90b --- /dev/null +++ b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json @@ -0,0 +1,25 @@ +{ + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "weight": 20, + "name": "spelunkery:end_stone_pebble" + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "minecraft:ender_pearl" + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "minecraft:popped_chorus_fruit" + } + ] + } + ] + } \ No newline at end of file diff --git a/mods/ns-cr-rc.pw.toml b/mods/ns-cr-rc.pw.toml new file mode 100644 index 0000000..e433983 --- /dev/null +++ b/mods/ns-cr-rc.pw.toml @@ -0,0 +1,13 @@ +name = "Nature's Spirit - Create Recipe Compat" +filename = "ns-cr-rc-0.0.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/f9HHknd6/versions/ZqpW9xJR/ns-cr-rc-0.0.0.jar" +hash-format = "sha512" +hash = "719d515d59c2979ea0733269df52ecc8772e74ca193f341b6104a8a28663fa6ce3a0c8a8a7d66e950c6be7807ecbf3e7e366f23333475ba389b647a67907a0e8" + +[update] +[update.modrinth] +mod-id = "f9HHknd6" +version = "ZqpW9xJR" diff --git a/pack.toml b/pack.toml index 93b8f44..fc5c435 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 = "b649629d5c5bb318f73e8c40c532f6a0f95e782ee1f8e493a94aed99afb9e24b" +hash = "96b8c971e4654a82c5dcd8da6de1bc82c6fc815ff5e0ad25a82bafe53d3f4161" [versions] fabric = "0.16.5" From 95c285bbfaeaa500b23351837f6f8c3a21257243 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:35:00 +0000 Subject: [PATCH 12/23] Update serene seasons config --- config/sereneseasons/fertility.toml | 12 +++ config/sereneseasons/seasons.toml | 146 ++++++++++++++++++++++++++++ index.toml | 8 ++ pack.toml | 2 +- 4 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 config/sereneseasons/fertility.toml create mode 100644 config/sereneseasons/seasons.toml diff --git a/config/sereneseasons/fertility.toml b/config/sereneseasons/fertility.toml new file mode 100644 index 0000000..3e6df35 --- /dev/null +++ b/config/sereneseasons/fertility.toml @@ -0,0 +1,12 @@ +[general] + #Whether crops are affected by seasons. + seasonal_crops = true + #How crops behave when out of season. + #0 = Grow slowly + #1 = Can't grow + #2 = Break when trying to grow + out_of_season_crop_behavior = 0 + #Maximum height level for out of season crops to have fertility underground. + underground_fertility_level = 48 + #Whether to include tooltips on crops listing which seasons they're fertile in. Note: This only applies to listed crops. + crop_tooltips = true diff --git a/config/sereneseasons/seasons.toml b/config/sereneseasons/seasons.toml new file mode 100644 index 0000000..b6532e1 --- /dev/null +++ b/config/sereneseasons/seasons.toml @@ -0,0 +1,146 @@ +[aesthetic_settings] + #Change the foliage colour based on the current season + change_foliage_color = true + #Change the grass color based on the current season + change_grass_color = true + #Change the birch colour based on the current season + change_birch_color = true +[dimension_settings] + #Seasons will only apply to dimensons listed here + whitelisted_dimensions = ["minecraft:overworld"] +[weather_settings] + #Change the frequency of rain/snow/storms based on the season + change_weather_frequency = true + #Generate snow and ice during the Winter season + generate_snow_ice = true +[time_settings] + #The starting sub season for new worlds. + #0 = Random, 1 - 3 = Early/Mid/Late Spring + #4 - 6 = Early/Mid/Late Summer + #7 - 9 = Early/Mid/Late Autumn + #10 - 12 = Early/Mid/Late Winter + starting_sub_season = 1 + #The duration of a sub season in days. + sub_season_duration = 96 + #If the season should progress on a server with no players online + progress_season_while_offline = true + #The duration of a Minecraft day in ticks. + #This only adjusts the internal length of a day used by the season cycle. + #It is intended to be used in conjunction with another mod which adjusts the actual length of a Minecraft day. + day_duration = 24000 +#melt_percent is the 0-1 percentage chance a snow or ice block will melt when chosen. (e.g. 100.0 = 100%, 50.0 = 50%) +#melt_rolls is the number of blocks randomly picked in each chunk, each tick. (High number rolls is not recommended on servers) +#melt_rolls should be 0 if blocks should not melt in that season. +#biome_temp_adjustment is the amount to adjust the biome temperature by from -10.0 to 10.0. +#min_rain_time is the minimum time interval between rain events in ticks. Set to -1 to disable rain. +#max_rain_time is the maximum time interval between rain events in ticks. Set to -1 to disable rain. +#min_thunder_time is the minimum time interval between thunder events in ticks. Set to -1 to disable thunder. +#max_thunder_time is the maximum time interval between thunder events in ticks. Set to -1 to disable thunder. +[[season_properties]] + melt_percent = 0.0 + max_rain_time = 36000 + min_rain_time = 12000 + season = "EARLY_WINTER" + melt_rolls = 0 + max_thunder_time = -1 + biome_temp_adjustment = -0.8 + min_thunder_time = -1 +[[season_properties]] + melt_percent = 12.5 + max_rain_time = 96000 + min_rain_time = 12000 + season = "LATE_SPRING" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 25.0 + max_rain_time = 96000 + min_rain_time = 12000 + season = "EARLY_SUMMER" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 25.0 + max_rain_time = 96000 + min_rain_time = 12000 + season = "LATE_SUMMER" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 0.0 + max_rain_time = 36000 + min_rain_time = 12000 + season = "MID_WINTER" + melt_rolls = 0 + max_thunder_time = -1 + biome_temp_adjustment = -0.8 + min_thunder_time = -1 +[[season_properties]] + melt_percent = 8.33 + max_rain_time = 180000 + min_rain_time = 12000 + season = "MID_AUTUMN" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 12.5 + max_rain_time = 180000 + min_rain_time = 12000 + season = "EARLY_AUTUMN" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 25.0 + max_rain_time = 96000 + min_rain_time = 12000 + season = "MID_SUMMER" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 8.33 + max_rain_time = 96000 + min_rain_time = 12000 + season = "MID_SPRING" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = 0.0 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 6.25 + max_rain_time = 180000 + min_rain_time = 12000 + season = "LATE_AUTUMN" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = -0.25 + min_thunder_time = 12000 +[[season_properties]] + melt_percent = 0.0 + max_rain_time = 36000 + min_rain_time = 12000 + season = "LATE_WINTER" + melt_rolls = 0 + max_thunder_time = -1 + biome_temp_adjustment = -0.8 + min_thunder_time = -1 +[[season_properties]] + melt_percent = 6.25 + max_rain_time = 96000 + min_rain_time = 12000 + season = "EARLY_SPRING" + melt_rolls = 1 + max_thunder_time = 180000 + biome_temp_adjustment = -0.25 + min_thunder_time = 12000 diff --git a/index.toml b/index.toml index 743679f..46feaf2 100644 --- a/index.toml +++ b/index.toml @@ -261,6 +261,14 @@ hash = "c3e2996ab28fcbc84ed04b9f20cbeeb347e594da22b680bc70c7748b8285b3ac" file = "config/puzzle.json" hash = "21829a5d69be72b4202c975210a69c9331d75cd0cb7a9cddde56dac1131774ac" +[[files]] +file = "config/sereneseasons/fertility.toml" +hash = "722f7545a5a592f0aed25ae8dd0a4f53f7abaf0bb53da96417d87e9096e75631" + +[[files]] +file = "config/sereneseasons/seasons.toml" +hash = "9a4e136103db2a7922d075a75f8c4a9980f62d32b0b2e412d9e3c1ba5be03ae6" + [[files]] file = "config/servercore/config.yml" hash = "de6cd8419ec8114d43e3477dbcc5e18aa68e1710d59d989a4635adc533a33917" diff --git a/pack.toml b/pack.toml index fc5c435..49983c9 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 = "96b8c971e4654a82c5dcd8da6de1bc82c6fc815ff5e0ad25a82bafe53d3f4161" +hash = "e710488e264aad94123d75dc43bf88b70995570f22f02da6b54c28bad52a8917" [versions] fabric = "0.16.5" From 591afcb5d5f245d3a899214d58e908639515f143 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:51:50 +0000 Subject: [PATCH 13/23] Decrease the chances of getting netherite scrap from sluices --- index.toml | 2 +- .../loot_tables/gameplay/sluice/lava/passive.json | 8 ++++---- pack.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.toml b/index.toml index 46feaf2..84783d2 100644 --- a/index.toml +++ b/index.toml @@ -503,7 +503,7 @@ hash = "ddec276786d2a9082eb9376604cccb1fce7694d9d15ce4e6bacf95ccf1c650da" [[files]] file = "kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json" -hash = "1988bd3fe557fce4c56e357fbf857e308868c64501c95857039667c7a1fd7255" +hash = "e4a27bee2c336a8f69cd0fc35dd9c254ab7746e19b9992588e9322e6cb47cca4" [[files]] file = "kubejs/data/spelunkery/loot_tables/gameplay/sluice/portal_fluid/passive.json" diff --git a/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json index f6a2afb..dd1e83a 100644 --- a/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json +++ b/kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json @@ -6,12 +6,12 @@ "entries": [ { "type": "minecraft:item", - "weight": 150, + "weight": 300, "name": "spelunkery:magma_pebble" }, { "type": "minecraft:item", - "weight": 10, + "weight": 5, "name": "spelunkery:raw_gold_nugget" }, { @@ -41,12 +41,12 @@ { "type": "minecraft:item", - "weight": 200, + "weight": 600, "name": "spelunkery:netherrack_pebble" }, { "type": "minecraft:item", - "weight": 100, + "weight": 300, "name": "spelunkery:blackstone_pebble", "conditions": [ { diff --git a/pack.toml b/pack.toml index 49983c9..763442f 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 = "e710488e264aad94123d75dc43bf88b70995570f22f02da6b54c28bad52a8917" +hash = "190e1a6613e1451fbe0ebac96aeb4079fb5927e5795d9538233654a92ef44a9c" [versions] fabric = "0.16.5" From f570601bb89906104cc45090163976109f026362 Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Mon, 25 Nov 2024 19:01:12 -0800 Subject: [PATCH 14/23] trying out Enhanced Weather --- index.toml | 10 + kubejs/assets/relics/models/CFinder.json | 322 ++++++++++++++++++ .../assets/relics/textures/model/CFinder.png | Bin 0 -> 1299 bytes .../relics/textures/model/CFinder_e.png | Bin 0 -> 604 bytes kubejs/server_scripts/relics.js | 157 ++++++--- mods/enhanced-weather.pw.toml | 13 + mods/owo-lib.pw.toml | 13 + pack.toml | 4 + 8 files changed, 479 insertions(+), 40 deletions(-) create mode 100644 kubejs/assets/relics/models/CFinder.json create mode 100644 kubejs/assets/relics/textures/model/CFinder.png create mode 100644 kubejs/assets/relics/textures/model/CFinder_e.png create mode 100644 mods/enhanced-weather.pw.toml create mode 100644 mods/owo-lib.pw.toml diff --git a/index.toml b/index.toml index 84783d2..970b84a 100644 --- a/index.toml +++ b/index.toml @@ -1057,6 +1057,11 @@ file = "mods/enhanced-groups.pw.toml" hash = "d1c3e8626b56c91b98a0d0472b00fcc6b890006bed3b3b6aba0899d260debc27" metafile = true +[[files]] +file = "mods/enhanced-weather.pw.toml" +hash = "8e8c7dbc64b07e88e4e7f19b88bf9e5d8f97cac3082fdac76f2ef5e0f7be658c" +metafile = true + [[files]] file = "mods/entity-model-features.pw.toml" hash = "2beb95d8ff5770b423a562d408305b92c20b873a1d3b56f059d2837ea61fbbe4" @@ -1552,6 +1557,11 @@ file = "mods/optigui.pw.toml" hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05" metafile = true +[[files]] +file = "mods/owo-lib.pw.toml" +hash = "28b3e0806647eb166e942cf6552993bb6d666949c53f0d51927bdfb063cb6cc4" +metafile = true + [[files]] file = "mods/patchouli.pw.toml" hash = "89e5cab6f92dbcfd6c2c058fc9381869fde193a431c284dbb828833e881cd344" diff --git a/kubejs/assets/relics/models/CFinder.json b/kubejs/assets/relics/models/CFinder.json new file mode 100644 index 0000000..5c0b67a --- /dev/null +++ b/kubejs/assets/relics/models/CFinder.json @@ -0,0 +1,322 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "3": "block/CFinder" + }, + "elements": [ + { + "name": "Handguard", + "from": [6.77818, -1.5, 0.47182], + "to": [8.27818, 0, 6.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [6.5, 11.5, 7.25, 12.25], "texture": "#3"}, + "east": {"uv": [7.5, 4.5, 10.5, 5.25], "texture": "#3"}, + "south": {"uv": [11.5, 6.5, 12.25, 7.25], "texture": "#3"}, + "west": {"uv": [6, 6.5, 9, 7.25], "texture": "#3"}, + "up": {"uv": [10.5, 6.25, 7.5, 5.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [9, 7.5, 6, 8.25], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "HandguardFrame", + "from": [6.77818, 0, 0.47182], + "to": [8.27818, 1, 2.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [12, 9.5, 12.75, 10], "texture": "#3"}, + "east": {"uv": [12, 1.5, 13, 2], "texture": "#3"}, + "south": {"uv": [12, 10, 12.75, 10.5], "texture": "#3"}, + "west": {"uv": [12, 1, 13, 1.5], "texture": "#3"}, + "up": {"uv": [12, 11.75, 11, 11], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 11.5, 0, 12.25], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "GuardFrame", + "from": [7.12818, -1.93986, 7.46626], + "to": [7.92818, -1.18986, 9.46626], + "rotation": {"angle": 45, "axis": "x", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [10, 4, 10.5, 4.5], "texture": "#3"}, + "east": {"uv": [2, 12, 3, 12.5], "texture": "#3"}, + "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#3"}, + "west": {"uv": [3, 12, 4, 12.5], "texture": "#3"}, + "up": {"uv": [5, 12.5, 4, 12], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 12, 5, 12.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "GuardFrame", + "from": [7.12818, -0.5, 6.47182], + "to": [7.92818, 0, 8.07182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [12.5, 2.5, 13, 2.75], "texture": "#3"}, + "east": {"uv": [12.5, 2, 13.25, 2.25], "texture": "#3"}, + "south": {"uv": [12.5, 4.5, 13, 4.75], "texture": "#3"}, + "west": {"uv": [2, 12.5, 2.75, 12.75], "texture": "#3"}, + "up": {"uv": [12.75, 11, 12, 10.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [11.75, 12, 11, 12.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Guard", + "from": [6.97818, -2.77868, 5.37256], + "to": [8.07818, -0.77868, 6.62256], + "rotation": {"angle": -45, "axis": "x", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [13, 9, 12, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [1, 11.5, 2, 12.25], "rotation": 270, "texture": "#3"}, + "south": {"uv": [13, 8, 12, 7.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [11.5, 2, 12.5, 2.75], "rotation": 90, "texture": "#3"}, + "up": {"uv": [12, 11, 12.5, 11.75], "rotation": 180, "texture": "#3"}, + "down": {"uv": [6, 12, 6.5, 12.75], "texture": "#3"} + } + }, + { + "name": "Guard", + "from": [7.07818, -2.75511, 8.03434], + "to": [7.97818, 0.24489, 9.23434], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [13, 4, 11.5, 4.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [10.5, 7.5, 12, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [13, 4, 11.5, 3.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [11.5, 3, 13, 3.5], "rotation": 90, "texture": "#3"}, + "up": {"uv": [1.5, 12.5, 2, 13], "rotation": 180, "texture": "#3"}, + "down": {"uv": [5.5, 10, 6, 10.5], "texture": "#3"} + } + }, + { + "name": "GuardFrame", + "from": [7.27818, -2.75511, 9.18434], + "to": [7.77818, 0.24489, 9.48434], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [14, 0.5, 12.5, 0.75], "rotation": 90, "texture": "#3"}, + "east": {"uv": [12, 12, 13.5, 12.25], "rotation": 270, "texture": "#3"}, + "south": {"uv": [14, 0.25, 12.5, 0], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 12.5, 1.5, 12.75], "rotation": 90, "texture": "#3"}, + "up": {"uv": [12.5, 5, 12.75, 5.25], "rotation": 180, "texture": "#3"}, + "down": {"uv": [5, 12.5, 5.25, 12.75], "texture": "#3"} + } + }, + { + "name": "Breach", + "from": [6.52818, 1, 6.47182], + "to": [8.52818, 3, 7.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [10.5, 5.5, 11.5, 6.5], "texture": "#3"}, + "east": {"uv": [5, 11, 5.5, 12], "texture": "#3"}, + "south": {"uv": [6.5, 10.5, 7.5, 11.5], "texture": "#3"}, + "west": {"uv": [8.5, 10.5, 9, 11.5], "texture": "#3"}, + "up": {"uv": [9, 12.5, 8.5, 11.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [9.5, 11.5, 9, 12.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Barrel", + "from": [6.27818, 0.75, 1.47182], + "to": [8.77818, 3.25, 6.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [8.5, 3, 9.75, 4.25], "texture": "#3"}, + "east": {"uv": [6, 1.5, 8.5, 2.75], "texture": "#3"}, + "south": {"uv": [9, 6.5, 10.25, 7.75], "texture": "#3"}, + "west": {"uv": [6, 0, 8.5, 1.25], "texture": "#3"}, + "up": {"uv": [4.5, 7.25, 2, 6], "rotation": 270, "texture": "#3"}, + "down": {"uv": [8.5, 3, 6, 4.25], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Nozzle", + "from": [6.52818, 1, 0.47182], + "to": [8.52818, 3, 1.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [10.5, 6.5, 11.5, 7.5], "texture": "#3"}, + "east": {"uv": [10, 11.5, 10.5, 12.5], "texture": "#3"}, + "south": {"uv": [7.5, 10.5, 8.5, 11.5], "texture": "#3"}, + "west": {"uv": [9.5, 11.5, 10, 12.5], "texture": "#3"}, + "up": {"uv": [11, 12.5, 10.5, 11.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [12.5, 0, 12, 1], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "ReceiverRear", + "from": [5.62818, 1.90661, 10.97693], + "to": [9.42818, 3.40661, 12.97693], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [10, 1, 12, 1.75], "texture": "#3"}, + "east": {"uv": [11.5, 4.5, 12.5, 5.25], "texture": "#3"}, + "south": {"uv": [10, 0, 12, 0.75], "texture": "#3"}, + "west": {"uv": [11.5, 5.5, 12.5, 6.25], "texture": "#3"}, + "up": {"uv": [5, 10, 4, 8], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 8, 5, 10], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Receiver", + "from": [5.52818, 0, 5.97182], + "to": [9.52818, 4, 11.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [0, 6, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 2.75, 2], "texture": "#3"}, + "south": {"uv": [4, 4, 6, 6], "texture": "#3"}, + "west": {"uv": [0, 2, 2.75, 4], "texture": "#3"}, + "up": {"uv": [5.75, 2, 3, 0], "rotation": 90, "texture": "#3"}, + "down": {"uv": [5.75, 2, 3, 4], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "ReceiverRear", + "from": [5.87818, 0.75, 11.47182], + "to": [9.17818, 3.25, 14.47182], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [0, 8, 1.75, 9.25], "texture": "#3"}, + "east": {"uv": [8.5, 0, 10, 1.25], "texture": "#3"}, + "south": {"uv": [2, 7.5, 3.75, 8.75], "texture": "#3"}, + "west": {"uv": [8.5, 1.5, 10, 2.75], "texture": "#3"}, + "up": {"uv": [6, 7.75, 4.5, 6], "rotation": 90, "texture": "#3"}, + "down": {"uv": [7.5, 4.5, 6, 6.25], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "BarrelPort", + "from": [9.53818, 4.01, 7.48182], + "to": [5.51818, -0.01, 5.96182], + "light_emission": 15, + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [2, 4, 4, 6], "rotation": 180, "texture": "#3"}, + "east": {"uv": [9, 8, 9.75, 10], "rotation": 180, "texture": "#3"}, + "south": {"uv": [0, 4, 2, 6], "rotation": 180, "texture": "#3"}, + "west": {"uv": [3, 9, 3.75, 11], "rotation": 180, "texture": "#3"}, + "up": {"uv": [1.75, 9.5, 1, 11.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0.75, 11.5, 0, 9.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Display", + "from": [6.52818, 1.03657, 11.39903], + "to": [8.52818, 3.03657, 14.39903], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [11, 10, 12, 11], "texture": "#3"}, + "east": {"uv": [10, 2, 11.5, 3], "texture": "#3"}, + "south": {"uv": [11, 9, 12, 10], "texture": "#3"}, + "west": {"uv": [10, 3, 11.5, 4], "texture": "#3"}, + "up": {"uv": [5.5, 11, 4, 10], "rotation": 90, "texture": "#3"}, + "down": {"uv": [11.5, 8, 10, 9], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Screen", + "from": [6.77818, 1.28657, 14.39903], + "to": [8.27818, 2.78657, 14.64903], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [11.5, 8, 12.25, 8.75], "texture": "#3"}, + "east": {"uv": [3, 12.5, 3.25, 13.25], "texture": "#3"}, + "south": {"uv": [7.5, 11.5, 8.25, 12.25], "texture": "#3"}, + "west": {"uv": [3.5, 12.5, 3.75, 13.25], "texture": "#3"}, + "up": {"uv": [4.25, 13.25, 4, 12.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [4.75, 12.5, 4.5, 13.25], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Grip", + "from": [6.62818, -4.64733, 12.60578], + "to": [8.42818, -1.14733, 14.60578], + "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [2, 9, 3, 10.75], "texture": "#3"}, + "east": {"uv": [6, 8.5, 7, 10.25], "texture": "#3"}, + "south": {"uv": [7, 8.5, 8, 10.25], "texture": "#3"}, + "west": {"uv": [8, 8.5, 9, 10.25], "texture": "#3"}, + "up": {"uv": [11, 11.5, 10, 10.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [3, 11, 2, 12], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Grip", + "from": [6.57818, -4.35537, 13.97818], + "to": [8.47818, -1.75537, 16.07818], + "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, + "faces": { + "north": {"uv": [5.5, 10.5, 6.5, 11.75], "texture": "#3"}, + "east": {"uv": [9, 10, 10, 11.25], "texture": "#3"}, + "south": {"uv": [10, 9, 11, 10.25], "texture": "#3"}, + "west": {"uv": [10.5, 4, 11.5, 5.25], "texture": "#3"}, + "up": {"uv": [4, 12, 3, 11], "rotation": 90, "texture": "#3"}, + "down": {"uv": [5, 11, 4, 12], "rotation": 270, "texture": "#3"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0.5, 5.5, -4.75], + "scale": [0.75, 0.75, 0.75] + }, + "thirdperson_lefthand": { + "translation": [-0.5, 5.5, -4.75], + "scale": [0.75, 0.75, 0.75] + }, + "firstperson_righthand": { + "translation": [-1.5, 9, -1] + }, + "firstperson_lefthand": { + "translation": [-2.5, 9, -1] + }, + "ground": { + "translation": [0, 6, 0], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [-160, -60, 180], + "translation": [0, 7, 0] + }, + "fixed": { + "rotation": [-180, 90, -180], + "translation": [0, 7, -1.75] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Handgaurd", + "origin": [9.98753, -3.75511, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6] + }, + { + "name": "Barrel", + "origin": [8, 0, 8], + "color": 0, + "children": [7, 8, 9] + }, + { + "name": "Receiver", + "origin": [8, 0, 8], + "color": 0, + "children": [10, 11, 12, 13] + }, + 14, + 15, + 16, + 17 + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/relics/textures/model/CFinder.png b/kubejs/assets/relics/textures/model/CFinder.png new file mode 100644 index 0000000000000000000000000000000000000000..e0f5b0e62bb3d6c64e5e65e34563dc69b58b51fc GIT binary patch literal 1299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0d3GfMVUA%l{bZlHkR?adNt=aPz`uYdN#3h79M7qV7rN+gz#JW$PJ$I3` z;yfXVSseWSfkAE_p7R$kJ!{91l#&(_7H$_&pz9nN=2g+u!7MPVD%2q~JhGv= zH7+75A~^K0F|(GowyBxVas{N zlQ}Ijd#66%b`8#BmTXI64Gu+1E{M`Q5G5fr*;a6sh0IA?-a0d&!&j_s*#e|&N`m}? z|C0|Gc6Yp94m5|ez$3Dlfr0NZ2s0kfUy;JVz`VfI#W5tp{q3~e_*(`dM_+RpWo9yp zR!;B@cy{=TEyJs6@Bi;DJGXaxrbb9%{;jRTmXa7EyZm;IN~N^>u}_ht*E6 z4STI@nWgSDr)<-j$;T@1iOv!H>hb@FitpUXpE{>~wz0RBqfdGgbsyw`z&aSH1jln?tg@&~5i52Dc;ONgr?Xbp@_IZDHfglD(QBAr26`r)6){N6 zJ92QjqQCz+t6~N2%#BXDLV`yZ8~m^dd|&kbT~Wa1o>2C$Om6?3^xsZWapV)Y;naV# z#_YQ6O2IDi9Xs|sy1MKw< z@P&f!Wvj+j%#oMeCi(nzWsi7JE35JCgD4aGq@!KTb{pAVPF3U#`Y?qrM|SP*rw#sV z9IH}2nnY~k7Q~dlUBCK(dX#zN+U;}2HOk{I)bsCQ*f#rZttdw(zxv^AGU_2~>K)fM zPk2~iBe$z&V}v^&vuPyDW> z^Xzl$?%iL5Ib;jCL=OF)8NE`eA@HXlJO6jPPOEKkK1$qkj+9t!4N!fw;!g+j_ZQO* zOAe$inZQxAnxp18NQmQsPlL+EjbF96coOzGEt0pFm$iSy;B@Ds&9-kb3wX7!ad$BL zxUyd9-xO2$WrOMwe@6$SQm$Eosee^ER|soN(r}hot@{2NGtmaV<AV)LLQx+bVu(rq<@~8x%j7 k{}KP8@9=MHLvcOBW$n6Zb(8QuUPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T?%?}Q2ZDwNGY+eJq`_R zk|xdl=sgdFH}^tA?m6!{xwoX7UXyC0>x_rWDX=<=1c239oDYDIH|X%_^gJ{U=>e?H zA^~6(1Wm|UKr<2mR%h{8XVN*O;JaU>)$)+0X`?fYeMS_#ORQCWx*pG{CHCc8^GDZ_E3a=@-n=X`5Dh49Wx_u0OBLkB7YoVp3}t@Rkw1a { lance(event.getEntity(), event.getEntity().server); } else if (id == "debugEntityType") { debugEntityType(event.getEntity(), event.getEntity().server); - } else if (id == "experienceToFunds"){ + } else if (id == "experienceToFunds") { experienceToFunds(event.getEntity(), event.getEntity().server); - } else if (id == "witherRocket"){ + } else if (id == "witherRocket") { witherRocket(event.getEntity(), event.getEntity().server); - } else if (id == "runicBooster"){ + } else if (id == "runicBooster") { runicBooster(event.getEntity(), event.getEntity().server); - } else if (id == "spawnGate"){ + } else if (id == "spawnGate") { spawnGate(event.getEntity(), event.getEntity().server); - } else if (id == "banish"){ + } else if (id == "banish") { banish(event.getEntity(), event.getEntity().server); - } else if (id == "summonPlayer"){ + } else if (id == "summonPlayer") { summonPlayer(event.getEntity(), event.getEntity().server); - } else if (id == "placeNode"){ + } else if (id == "placeNode") { placeNode(event.getEntity(), event.getEntity().server); - } else if (id == "yeet"){ + } else if (id == "yeet") { yeet(event.getEntity(), event.getEntity().server); - } else if (id == "impulseBooster"){ + } else if (id == "impulseBooster") { impulseBooster(event.getEntity(), event.getEntity().server); + } else if (id == "spawnGateIndirect") { + spawnGateIndirect(event.getEntity(), event.getEntity().server); + } else if (id == "tellSpawn") { + tellSpawn(event.getEntity(), event.getEntity().server); } /** * @@ -75,6 +79,20 @@ ServerEvents.customCommand((event) => { server.runCommandSilent("execute at " + id + " run " + cmd); } + /** + * @param {Internal.UUID} uuid + * @returns {Internal.Entity} + */ + function getEntityByID(uuid) { + let entities = Utils.server.getEntities(); + for (let i = 0; i < entities.size(); i++) { + if (entities.get(i).uuid == uuid) { + console.log(i); + return entities.get(i) + } + } + } + /** * * @param {Internal.LivingEntity} entity @@ -97,6 +115,26 @@ ServerEvents.customCommand((event) => { cmd_at(entity, server, "playsound minecraft:block.respawn_anchor.deplete master @a[distance=..5] ~ ~ ~ 5"); } + /** + * + * @param {Internal.MinecraftServer} server + */ + + function teleExitFromString(uuid, server) { + server.runCommandSilent("execute at " + uuid + " run playsound minecraft:entity.enderman.teleport master @a[distance=..10] ~ ~ ~ 5"); + server.runCommandSilent("execute at " + uuid + " run particle minecraft:reverse_portal ~ ~ ~ 0 1 0 5 1000 normal") + } + + /** + * + * @param {Internal.MinecraftServer} server + */ + + function teleEnterFromString(uuid, server) { + server.runCommandSilent("execute at " + uuid + " run particle minecraft:portal ~ ~ ~ 0 1 0 5 1000 normal"); + server.runCommandSilent("execute at " + uuid + " run playsound minecraft:block.respawn_anchor.deplete master @a[distance=..5] ~ ~ ~ 5") + } + /** * * @param {Internal.LivingEntity} entity @@ -203,17 +241,17 @@ ServerEvents.customCommand((event) => { * @param {Internal.Player} player * @param {Internal.MinecraftServer} server */ - function experienceToFunds(player, server){ - player.setXpLevel(getXpLevel()-1); + function experienceToFunds(player, server) { + player.setXpLevel(player.getXpLevel() - 1); player.give("numismatics:crown"); - } + } /** * * @param {Internal.Player} player * @param {Internal.MinecraftServer} server */ - function witherRocket(player, server){ + function witherRocket(player, server) { let skull = player.block.up.up.createEntity("wither_skull"); skull.shootFromRotation(player, player.pitch, player.yaw, 0, 3, 1); skull.spawn(); @@ -225,8 +263,8 @@ ServerEvents.customCommand((event) => { * @param {Internal.Player} player * @param {Internal.MinecraftServer} server */ - function runicBooster(player, server){ - for(i = 0; i < 200; i++) + function runicBooster(player, server) { + for (i = 0; i < 200; i++) player.boostElytraFlight(); } @@ -235,7 +273,7 @@ ServerEvents.customCommand((event) => { * @param {Internal.Player} player * @param {Internal.MinecraftServer} server */ - function spawnGate(player, server){ + function spawnGate(player, server) { var retX = player.nbt.getInt('SpawnX'); var retY = player.nbt.getInt('SpawnY'); var retZ = player.nbt.getInt('SpawnZ'); @@ -244,6 +282,42 @@ ServerEvents.customCommand((event) => { teleEnter(player, server); } + /** + * + * @param {Internal.Player} player + * @param {Internal.MinecraftServer} server + */ + function spawnGateIndirect(player, server) { + var rayHit = player.rayTrace(64, true); + var target = rayHit.entity; + if (rayHit.entity.type == "minecraft:player") { + var retX = target.nbt.getInt('SpawnX'); + var retY = target.nbt.getInt('SpawnY'); + var retZ = target.nbt.getInt('SpawnZ'); + teleExit(target, server); + cmd_in(target, server, "minecraft:overworld", "tp " + retX + " " + retY + " " + retZ); + teleEnter(target, server); + } + + } + + /** + * + * @param {Internal.Player} player + * @param {Internal.MinecraftServer} server + */ + function tellSpawn(player, server) { + var rayHit = player.rayTrace(64, true); + var target = rayHit.entity; + if (rayHit.entity.type == "minecraft:player") { + var retX = target.nbt.getInt('SpawnX'); + var retY = target.nbt.getInt('SpawnY'); + var retZ = target.nbt.getInt('SpawnZ'); + player.tell("Target player's spawn is at: " + retX + ", " + retY + ", " + retZ) + } + + } + /** * * @param {Internal.LivingEntity} entity @@ -253,33 +327,36 @@ ServerEvents.customCommand((event) => { var rayHit = entity.rayTrace(64, false); if (rayHit != null && rayHit.entity.type == "minecraft:player") { var target = rayHit.entity; + teleExit(target, server); cmd_as(target, server, "clear @s spelunkery:portal_fluid_bottle"); cmd_as(target, server, "clear @s spelunkery:portal_fluid_bucket"); cmd_in(target, server, "minecraft:the_end", "tp 372 64 510"); + teleEnter(target, server); } } /** * - * @param {Internal.LivingEntity} entity + * @param {Internal.LivingEntity} player * @param {Internal.MinecraftServer} server */ - function summonPlayer(entity, server){ - var summoner = entity.getProfile().getId().toString(); - var summonDim = entity.getLevel().dimension; - var offhandItem = entity.getOffhandItem(); - var skullOwner = offhandItem.getTagElement("SkullOwner"); - if (skullOwner == null || !skullOwner.hasUUID("Id")) { - return; - } - var rayHit = entity.rayTrace(64, false); - var hitX = rayHit.getHitX(); - var hitY = rayHit.getHitY(); - var hitZ = rayHit.getHitZ(); - var target = skullOwner.getUUID("Id").toString(); - - server.runCommandSilent("execute in "+summonDim+" run tp "+target+" "+hitX+" "+hitY+" "+hitZ); + function summonPlayer(player, server) { + var summoner = player.getProfile().getId().toString(); + var summonDim = player.getLevel().dimension; + var offhandItem = player.getOffhandItem(); + var skullOwner = offhandItem.getTagElement("SkullOwner"); + if (skullOwner == null || !skullOwner.hasUUID("Id")) { + return; + } + var rayHit = player.rayTrace(64, false); + var hitX = rayHit.getHitX(); + var hitY = rayHit.getHitY(); + var hitZ = rayHit.getHitZ(); + var targer = skullOwner.getUUID("Id").toString(); + teleExitFromString(target, server); + server.runCommandSilent("execute in " + summonDim + " run tp " + target + " " + hitX + " " + hitY + " " + hitZ); + teleEnterFromString(target, server); } /** @@ -288,20 +365,20 @@ ServerEvents.customCommand((event) => { * @param {Internal.MinecraftServer} server */ - function placeNode(entity, server){ + function placeNode(entity, server) { var rayHit = entity.rayTrace(256, false); var hitX = rayHit.getHitX(); var hitY = rayHit.getHitY(); var hitZ = rayHit.getHitZ(); var offhandItem = entity.getOffhandItem().getId(); entity.tell("Trying to place " + offhandItem + " node at " + Math.ceil(hitX) + ", " + Math.ceil(hitY) + ", " + Math.ceil(hitZ)); - if (offhandItem == "create:crimsite"){ + if (offhandItem == "create:crimsite") { server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:crimsite_node"); - } else if (offhandItem == "create:ochrum"){ + } else if (offhandItem == "create:ochrum") { server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:ochrum_node") - } else if (offhandItem == "create:veridium"){ + } else if (offhandItem == "create:veridium") { server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:veridium_node") - } else if (offhandItem == "create:asurine"){ + } else if (offhandItem == "create:asurine") { server.runCommandSilent("execute positioned " + hitX + " " + hitY + " " + hitZ + " run place structure deepdrilling:asurine_node") } else { entity.tell(Text.red("No selector item in hand!")); @@ -315,7 +392,7 @@ ServerEvents.customCommand((event) => { * @param {Internal.MinecraftServer} server */ - function yeet(entity, server){ + function yeet(entity, server) { var rayHit = entity.rayTrace(16, false); let speed = 50; let motionX = entity.lookAngle.x() * speed; @@ -324,14 +401,14 @@ ServerEvents.customCommand((event) => { rayHit.entity.setMotion(motionX, motionY, motionZ); rayHit.entity.hurtMarked = true; } - + /** * * @param {Internal.LivingEntity} entity * @param {Internal.MinecraftServer} server */ - function impulseBooster(entity, server){ + function impulseBooster(entity, server) { let speed = 1; let motionX = entity.lookAngle.x() * speed; let motionY = entity.lookAngle.y() * speed; diff --git a/mods/enhanced-weather.pw.toml b/mods/enhanced-weather.pw.toml new file mode 100644 index 0000000..d894f5e --- /dev/null +++ b/mods/enhanced-weather.pw.toml @@ -0,0 +1,13 @@ +name = "Enhanced Weather" +filename = "enhancedweather-1.1-Alpha2.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/NDrgrF35/versions/VzgOMMyW/enhancedweather-1.1-Alpha2.jar" +hash-format = "sha1" +hash = "d63f0774136566c60256a0e999f4a5a67667e46c" + +[update] +[update.modrinth] +mod-id = "NDrgrF35" +version = "VzgOMMyW" diff --git a/mods/owo-lib.pw.toml b/mods/owo-lib.pw.toml new file mode 100644 index 0000000..b7347dd --- /dev/null +++ b/mods/owo-lib.pw.toml @@ -0,0 +1,13 @@ +name = "oωo (owo-lib)" +filename = "owo-lib-0.11.2+1.20.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/ccKDOlHs/versions/zyOBB7J4/owo-lib-0.11.2%2B1.20.jar" +hash-format = "sha1" +hash = "be88938ca5df78271e64bc9f85c3575754f33e2a" + +[update] +[update.modrinth] +mod-id = "ccKDOlHs" +version = "zyOBB7J4" diff --git a/pack.toml b/pack.toml index 763442f..2ae51a8 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,11 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" +<<<<<<< Updated upstream hash = "190e1a6613e1451fbe0ebac96aeb4079fb5927e5795d9538233654a92ef44a9c" +======= +hash = "72b7a4eba7554c032ed698992802a6caec16d163d665566b5968e1f15ee07ced" +>>>>>>> Stashed changes [versions] fabric = "0.16.5" From f8bead40a591804db17827244414ff6f69d992bd Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Mon, 25 Nov 2024 19:02:27 -0800 Subject: [PATCH 15/23] whoops --- index.toml | 14 +++++++++++++- pack.toml | 6 +----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/index.toml b/index.toml index 970b84a..de3be35 100644 --- a/index.toml +++ b/index.toml @@ -373,6 +373,10 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" +[[files]] +file = "kubejs/assets/relics/models/CFinder.json" +hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" + [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -385,6 +389,14 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder.png" +hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" + +[[files]] +file = "kubejs/assets/relics/textures/model/CFinder_e.png" +hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" + [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" @@ -603,7 +615,7 @@ hash = "f6e82022fc644b4be24851a8efcf3ed4da3b0aa26d6948d12a2ba1a2920fc327" [[files]] file = "kubejs/server_scripts/relics.js" -hash = "aae8fabb7a802beebe767a9c2e24a3ae6d2fd1dd4cfbc0e3b5d0f4df5b5abe27" +hash = "021a0052a513de17b1bae88c0e4abb2c8522057bfed8cb10c4538452301cc633" [[files]] file = "kubejs/server_scripts/smithing.js" diff --git a/pack.toml b/pack.toml index 2ae51a8..0b8b16a 100644 --- a/pack.toml +++ b/pack.toml @@ -6,11 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -<<<<<<< Updated upstream -hash = "190e1a6613e1451fbe0ebac96aeb4079fb5927e5795d9538233654a92ef44a9c" -======= -hash = "72b7a4eba7554c032ed698992802a6caec16d163d665566b5968e1f15ee07ced" ->>>>>>> Stashed changes +hash = "a31e8f98e3bfceba65492b413f642dcbb7595dac98c06b02e468ff547f410311" [versions] fabric = "0.16.5" From 33faf99904f989d6049d0f996c885b45e55ff470 Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Mon, 25 Nov 2024 19:13:15 -0800 Subject: [PATCH 16/23] removed some unused files --- index.toml | 12 - kubejs/assets/relics/models/CFinder.json | 322 ------------------ .../assets/relics/textures/model/CFinder.png | Bin 1299 -> 0 bytes .../relics/textures/model/CFinder_e.png | Bin 604 -> 0 bytes pack.toml | 2 +- 5 files changed, 1 insertion(+), 335 deletions(-) delete mode 100644 kubejs/assets/relics/models/CFinder.json delete mode 100644 kubejs/assets/relics/textures/model/CFinder.png delete mode 100644 kubejs/assets/relics/textures/model/CFinder_e.png diff --git a/index.toml b/index.toml index de3be35..632688b 100644 --- a/index.toml +++ b/index.toml @@ -373,10 +373,6 @@ hash = "958be02577e9def636498145d5078d5340c482590137172f3985a11149aebe2f" file = "kubejs/assets/phonos/textures/item/dish_antenna.png" hash = "e36b7d017206c3eab3fc2a9c095704a236943a6169e77047e13b7db5ea33a04a" -[[files]] -file = "kubejs/assets/relics/models/CFinder.json" -hash = "3aba2d23ac8afa4b63135c2f0b01c3e0e8237fb865432ea9f4f571913ca9f7ad" - [[files]] file = "kubejs/assets/relics/models/voidgazer_spyglass.json" hash = "be5f221a7db244eee79fddc54723e26e98f459112b5940bf53df5b73a9a05c0d" @@ -389,14 +385,6 @@ hash = "8cbcc6fe46e6b83b1950ce6ee0a734960ad536ccd72281cb53c5f8ce8fbeb307" file = "kubejs/assets/relics/textures/item/voidgazer_spyglass.png" hash = "5087d0595fec12786463819fa2fb7d1f80ec00919e92b5914d99efd4d36fd811" -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder.png" -hash = "aedd9c0a8e571584705ccb73fca7635081a977961cfd671d75639d297dbbbdc9" - -[[files]] -file = "kubejs/assets/relics/textures/model/CFinder_e.png" -hash = "afbd17b9aeed30b64c76c6f19ac37b698358b7d50fc57e77e16c1dca64ee79de" - [[files]] file = "kubejs/assets/relics/textures/model/voidgazer_spyglass_model.png" hash = "bd24fa7297357125e80095e3e0b5093a1512599db197cc542745c93230425cfe" diff --git a/kubejs/assets/relics/models/CFinder.json b/kubejs/assets/relics/models/CFinder.json deleted file mode 100644 index 5c0b67a..0000000 --- a/kubejs/assets/relics/models/CFinder.json +++ /dev/null @@ -1,322 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "3": "block/CFinder" - }, - "elements": [ - { - "name": "Handguard", - "from": [6.77818, -1.5, 0.47182], - "to": [8.27818, 0, 6.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [6.5, 11.5, 7.25, 12.25], "texture": "#3"}, - "east": {"uv": [7.5, 4.5, 10.5, 5.25], "texture": "#3"}, - "south": {"uv": [11.5, 6.5, 12.25, 7.25], "texture": "#3"}, - "west": {"uv": [6, 6.5, 9, 7.25], "texture": "#3"}, - "up": {"uv": [10.5, 6.25, 7.5, 5.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [9, 7.5, 6, 8.25], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "HandguardFrame", - "from": [6.77818, 0, 0.47182], - "to": [8.27818, 1, 2.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [12, 9.5, 12.75, 10], "texture": "#3"}, - "east": {"uv": [12, 1.5, 13, 2], "texture": "#3"}, - "south": {"uv": [12, 10, 12.75, 10.5], "texture": "#3"}, - "west": {"uv": [12, 1, 13, 1.5], "texture": "#3"}, - "up": {"uv": [12, 11.75, 11, 11], "rotation": 270, "texture": "#3"}, - "down": {"uv": [1, 11.5, 0, 12.25], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "GuardFrame", - "from": [7.12818, -1.93986, 7.46626], - "to": [7.92818, -1.18986, 9.46626], - "rotation": {"angle": 45, "axis": "x", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [10, 4, 10.5, 4.5], "texture": "#3"}, - "east": {"uv": [2, 12, 3, 12.5], "texture": "#3"}, - "south": {"uv": [4, 7.5, 4.5, 8], "texture": "#3"}, - "west": {"uv": [3, 12, 4, 12.5], "texture": "#3"}, - "up": {"uv": [5, 12.5, 4, 12], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 12, 5, 12.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "GuardFrame", - "from": [7.12818, -0.5, 6.47182], - "to": [7.92818, 0, 8.07182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [12.5, 2.5, 13, 2.75], "texture": "#3"}, - "east": {"uv": [12.5, 2, 13.25, 2.25], "texture": "#3"}, - "south": {"uv": [12.5, 4.5, 13, 4.75], "texture": "#3"}, - "west": {"uv": [2, 12.5, 2.75, 12.75], "texture": "#3"}, - "up": {"uv": [12.75, 11, 12, 10.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [11.75, 12, 11, 12.5], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Guard", - "from": [6.97818, -2.77868, 5.37256], - "to": [8.07818, -0.77868, 6.62256], - "rotation": {"angle": -45, "axis": "x", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [13, 9, 12, 9.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [1, 11.5, 2, 12.25], "rotation": 270, "texture": "#3"}, - "south": {"uv": [13, 8, 12, 7.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [11.5, 2, 12.5, 2.75], "rotation": 90, "texture": "#3"}, - "up": {"uv": [12, 11, 12.5, 11.75], "rotation": 180, "texture": "#3"}, - "down": {"uv": [6, 12, 6.5, 12.75], "texture": "#3"} - } - }, - { - "name": "Guard", - "from": [7.07818, -2.75511, 8.03434], - "to": [7.97818, 0.24489, 9.23434], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [13, 4, 11.5, 4.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [10.5, 7.5, 12, 8], "rotation": 270, "texture": "#3"}, - "south": {"uv": [13, 4, 11.5, 3.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [11.5, 3, 13, 3.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [1.5, 12.5, 2, 13], "rotation": 180, "texture": "#3"}, - "down": {"uv": [5.5, 10, 6, 10.5], "texture": "#3"} - } - }, - { - "name": "GuardFrame", - "from": [7.27818, -2.75511, 9.18434], - "to": [7.77818, 0.24489, 9.48434], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [14, 0.5, 12.5, 0.75], "rotation": 90, "texture": "#3"}, - "east": {"uv": [12, 12, 13.5, 12.25], "rotation": 270, "texture": "#3"}, - "south": {"uv": [14, 0.25, 12.5, 0], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 12.5, 1.5, 12.75], "rotation": 90, "texture": "#3"}, - "up": {"uv": [12.5, 5, 12.75, 5.25], "rotation": 180, "texture": "#3"}, - "down": {"uv": [5, 12.5, 5.25, 12.75], "texture": "#3"} - } - }, - { - "name": "Breach", - "from": [6.52818, 1, 6.47182], - "to": [8.52818, 3, 7.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [10.5, 5.5, 11.5, 6.5], "texture": "#3"}, - "east": {"uv": [5, 11, 5.5, 12], "texture": "#3"}, - "south": {"uv": [6.5, 10.5, 7.5, 11.5], "texture": "#3"}, - "west": {"uv": [8.5, 10.5, 9, 11.5], "texture": "#3"}, - "up": {"uv": [9, 12.5, 8.5, 11.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [9.5, 11.5, 9, 12.5], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Barrel", - "from": [6.27818, 0.75, 1.47182], - "to": [8.77818, 3.25, 6.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [8.5, 3, 9.75, 4.25], "texture": "#3"}, - "east": {"uv": [6, 1.5, 8.5, 2.75], "texture": "#3"}, - "south": {"uv": [9, 6.5, 10.25, 7.75], "texture": "#3"}, - "west": {"uv": [6, 0, 8.5, 1.25], "texture": "#3"}, - "up": {"uv": [4.5, 7.25, 2, 6], "rotation": 270, "texture": "#3"}, - "down": {"uv": [8.5, 3, 6, 4.25], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Nozzle", - "from": [6.52818, 1, 0.47182], - "to": [8.52818, 3, 1.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [10.5, 6.5, 11.5, 7.5], "texture": "#3"}, - "east": {"uv": [10, 11.5, 10.5, 12.5], "texture": "#3"}, - "south": {"uv": [7.5, 10.5, 8.5, 11.5], "texture": "#3"}, - "west": {"uv": [9.5, 11.5, 10, 12.5], "texture": "#3"}, - "up": {"uv": [11, 12.5, 10.5, 11.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [12.5, 0, 12, 1], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "ReceiverRear", - "from": [5.62818, 1.90661, 10.97693], - "to": [9.42818, 3.40661, 12.97693], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [10, 1, 12, 1.75], "texture": "#3"}, - "east": {"uv": [11.5, 4.5, 12.5, 5.25], "texture": "#3"}, - "south": {"uv": [10, 0, 12, 0.75], "texture": "#3"}, - "west": {"uv": [11.5, 5.5, 12.5, 6.25], "texture": "#3"}, - "up": {"uv": [5, 10, 4, 8], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 8, 5, 10], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Receiver", - "from": [5.52818, 0, 5.97182], - "to": [9.52818, 4, 11.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [0, 6, 2, 8], "texture": "#3"}, - "east": {"uv": [0, 0, 2.75, 2], "texture": "#3"}, - "south": {"uv": [4, 4, 6, 6], "texture": "#3"}, - "west": {"uv": [0, 2, 2.75, 4], "texture": "#3"}, - "up": {"uv": [5.75, 2, 3, 0], "rotation": 90, "texture": "#3"}, - "down": {"uv": [5.75, 2, 3, 4], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "ReceiverRear", - "from": [5.87818, 0.75, 11.47182], - "to": [9.17818, 3.25, 14.47182], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [0, 8, 1.75, 9.25], "texture": "#3"}, - "east": {"uv": [8.5, 0, 10, 1.25], "texture": "#3"}, - "south": {"uv": [2, 7.5, 3.75, 8.75], "texture": "#3"}, - "west": {"uv": [8.5, 1.5, 10, 2.75], "texture": "#3"}, - "up": {"uv": [6, 7.75, 4.5, 6], "rotation": 90, "texture": "#3"}, - "down": {"uv": [7.5, 4.5, 6, 6.25], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "BarrelPort", - "from": [9.53818, 4.01, 7.48182], - "to": [5.51818, -0.01, 5.96182], - "light_emission": 15, - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [2, 4, 4, 6], "rotation": 180, "texture": "#3"}, - "east": {"uv": [9, 8, 9.75, 10], "rotation": 180, "texture": "#3"}, - "south": {"uv": [0, 4, 2, 6], "rotation": 180, "texture": "#3"}, - "west": {"uv": [3, 9, 3.75, 11], "rotation": 180, "texture": "#3"}, - "up": {"uv": [1.75, 9.5, 1, 11.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0.75, 11.5, 0, 9.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Display", - "from": [6.52818, 1.03657, 11.39903], - "to": [8.52818, 3.03657, 14.39903], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [11, 10, 12, 11], "texture": "#3"}, - "east": {"uv": [10, 2, 11.5, 3], "texture": "#3"}, - "south": {"uv": [11, 9, 12, 10], "texture": "#3"}, - "west": {"uv": [10, 3, 11.5, 4], "texture": "#3"}, - "up": {"uv": [5.5, 11, 4, 10], "rotation": 90, "texture": "#3"}, - "down": {"uv": [11.5, 8, 10, 9], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Screen", - "from": [6.77818, 1.28657, 14.39903], - "to": [8.27818, 2.78657, 14.64903], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [11.5, 8, 12.25, 8.75], "texture": "#3"}, - "east": {"uv": [3, 12.5, 3.25, 13.25], "texture": "#3"}, - "south": {"uv": [7.5, 11.5, 8.25, 12.25], "texture": "#3"}, - "west": {"uv": [3.5, 12.5, 3.75, 13.25], "texture": "#3"}, - "up": {"uv": [4.25, 13.25, 4, 12.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [4.75, 12.5, 4.5, 13.25], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Grip", - "from": [6.62818, -4.64733, 12.60578], - "to": [8.42818, -1.14733, 14.60578], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [2, 9, 3, 10.75], "texture": "#3"}, - "east": {"uv": [6, 8.5, 7, 10.25], "texture": "#3"}, - "south": {"uv": [7, 8.5, 8, 10.25], "texture": "#3"}, - "west": {"uv": [8, 8.5, 9, 10.25], "texture": "#3"}, - "up": {"uv": [11, 11.5, 10, 10.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [3, 11, 2, 12], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Grip", - "from": [6.57818, -4.35537, 13.97818], - "to": [8.47818, -1.75537, 16.07818], - "rotation": {"angle": 0, "axis": "y", "origin": [7.52818, 0.68758, 8]}, - "faces": { - "north": {"uv": [5.5, 10.5, 6.5, 11.75], "texture": "#3"}, - "east": {"uv": [9, 10, 10, 11.25], "texture": "#3"}, - "south": {"uv": [10, 9, 11, 10.25], "texture": "#3"}, - "west": {"uv": [10.5, 4, 11.5, 5.25], "texture": "#3"}, - "up": {"uv": [4, 12, 3, 11], "rotation": 90, "texture": "#3"}, - "down": {"uv": [5, 11, 4, 12], "rotation": 270, "texture": "#3"} - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [0.5, 5.5, -4.75], - "scale": [0.75, 0.75, 0.75] - }, - "thirdperson_lefthand": { - "translation": [-0.5, 5.5, -4.75], - "scale": [0.75, 0.75, 0.75] - }, - "firstperson_righthand": { - "translation": [-1.5, 9, -1] - }, - "firstperson_lefthand": { - "translation": [-2.5, 9, -1] - }, - "ground": { - "translation": [0, 6, 0], - "scale": [0.75, 0.75, 0.75] - }, - "gui": { - "rotation": [-160, -60, 180], - "translation": [0, 7, 0] - }, - "fixed": { - "rotation": [-180, 90, -180], - "translation": [0, 7, -1.75] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "Handgaurd", - "origin": [9.98753, -3.75511, 8], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6] - }, - { - "name": "Barrel", - "origin": [8, 0, 8], - "color": 0, - "children": [7, 8, 9] - }, - { - "name": "Receiver", - "origin": [8, 0, 8], - "color": 0, - "children": [10, 11, 12, 13] - }, - 14, - 15, - 16, - 17 - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/relics/textures/model/CFinder.png b/kubejs/assets/relics/textures/model/CFinder.png deleted file mode 100644 index e0f5b0e62bb3d6c64e5e65e34563dc69b58b51fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0d3GfMVUA%l{bZlHkR?adNt=aPz`uYdN#3h79M7qV7rN+gz#JW$PJ$I3` z;yfXVSseWSfkAE_p7R$kJ!{91l#&(_7H$_&pz9nN=2g+u!7MPVD%2q~JhGv= zH7+75A~^K0F|(GowyBxVas{N zlQ}Ijd#66%b`8#BmTXI64Gu+1E{M`Q5G5fr*;a6sh0IA?-a0d&!&j_s*#e|&N`m}? z|C0|Gc6Yp94m5|ez$3Dlfr0NZ2s0kfUy;JVz`VfI#W5tp{q3~e_*(`dM_+RpWo9yp zR!;B@cy{=TEyJs6@Bi;DJGXaxrbb9%{;jRTmXa7EyZm;IN~N^>u}_ht*E6 z4STI@nWgSDr)<-j$;T@1iOv!H>hb@FitpUXpE{>~wz0RBqfdGgbsyw`z&aSH1jln?tg@&~5i52Dc;ONgr?Xbp@_IZDHfglD(QBAr26`r)6){N6 zJ92QjqQCz+t6~N2%#BXDLV`yZ8~m^dd|&kbT~Wa1o>2C$Om6?3^xsZWapV)Y;naV# z#_YQ6O2IDi9Xs|sy1MKw< z@P&f!Wvj+j%#oMeCi(nzWsi7JE35JCgD4aGq@!KTb{pAVPF3U#`Y?qrM|SP*rw#sV z9IH}2nnY~k7Q~dlUBCK(dX#zN+U;}2HOk{I)bsCQ*f#rZttdw(zxv^AGU_2~>K)fM zPk2~iBe$z&V}v^&vuPyDW> z^Xzl$?%iL5Ib;jCL=OF)8NE`eA@HXlJO6jPPOEKkK1$qkj+9t!4N!fw;!g+j_ZQO* zOAe$inZQxAnxp18NQmQsPlL+EjbF96coOzGEt0pFm$iSy;B@Ds&9-kb3wX7!ad$BL zxUyd9-xO2$WrOMwe@6$SQm$Eosee^ER|soN(r}hot@{2NGtmaV<AV)LLQx+bVu(rq<@~8x%j7 k{}KP8@9=MHLvcOBW$n6Zb(8QuUPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T?%?}Q2ZDwNGY+eJq`_R zk|xdl=sgdFH}^tA?m6!{xwoX7UXyC0>x_rWDX=<=1c239oDYDIH|X%_^gJ{U=>e?H zA^~6(1Wm|UKr<2mR%h{8XVN*O;JaU>)$)+0X`?fYeMS_#ORQCWx*pG{CHCc8^GDZ_E3a=@-n=X`5Dh49Wx_u0OBLkB7YoVp3}t@Rkw1a Date: Tue, 26 Nov 2024 12:31:09 -0800 Subject: [PATCH 17/23] two tiny mods for making other things --- index.toml | 8 ++++++++ mods/air-strafing-attribute-1.3.jar | Bin 0 -> 8117 bytes mods/cmods-1.3.0+fabric-1.20.1.jar | Bin 0 -> 6367 bytes pack.toml | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mods/air-strafing-attribute-1.3.jar create mode 100644 mods/cmods-1.3.0+fabric-1.20.1.jar diff --git a/index.toml b/index.toml index 632688b..ff8d784 100644 --- a/index.toml +++ b/index.toml @@ -647,6 +647,10 @@ file = "mods/aileron.pw.toml" hash = "92c0c8ce733ad75ae5a207b20786dd7c712d90e9d0d5a390a5cbc00bf1cdf3bb" metafile = true +[[files]] +file = "mods/air-strafing-attribute-1.3.jar" +hash = "2bdc035efbf72c5ca0d861c099d3175e0cdcf4e0b6168826c898d9e508ade88f" + [[files]] file = "mods/almost-unified.pw.toml" hash = "ea9c9695bf4a5d371600366a3f24912042e09b6295a00eab6eaafddd598ec4bb" @@ -842,6 +846,10 @@ file = "mods/cloth-config.pw.toml" hash = "b2d6595b73bd66167a4d7ace472c54c0eab45f55e1769f4ff7da72ce8b58872a" metafile = true +[[files]] +file = "mods/cmods-1.3.0+fabric-1.20.1.jar" +hash = "a67bcbf8449587ac240a3f7ec794cb65dacde8755d3ca3315ad0bae4f3c3e8cf" + [[files]] file = "mods/cobweb.pw.toml" hash = "ba84a6676f1ab5ae9701bf8ad81903ff6c70ed2fe922da3cb1ffbcaf3218f34a" diff --git a/mods/air-strafing-attribute-1.3.jar b/mods/air-strafing-attribute-1.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..0d1ad2ca3642669d274a8886d5c400b75776efea GIT binary patch literal 8117 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 literal 0 HcmV?d00001 diff --git a/mods/cmods-1.3.0+fabric-1.20.1.jar b/mods/cmods-1.3.0+fabric-1.20.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..526d9338496b61581c163001765d9407b44e439a GIT binary patch literal 6367 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 literal 0 HcmV?d00001 diff --git a/pack.toml b/pack.toml index 53f1205..5ad5387 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 = "49a02923f0315eb26f4e74a9f3aaeed8d7498c6991d247157f107ece6366555d" +hash = "b9f396b218382f335b6726b06346a0c4ccf0af1fcf9c1dfe77bd921d72a5f3c0" [versions] fabric = "0.16.5" From 8b10e6354776ec5dfb11c3742ba421c374331c9f Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Tue, 26 Nov 2024 12:31:34 -0800 Subject: [PATCH 18/23] oreganized --- index.toml | 5 +++++ mods/oreganized.pw.toml | 13 +++++++++++++ pack.toml | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mods/oreganized.pw.toml diff --git a/index.toml b/index.toml index ff8d784..ef35f08 100644 --- a/index.toml +++ b/index.toml @@ -1565,6 +1565,11 @@ file = "mods/optigui.pw.toml" hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05" metafile = true +[[files]] +file = "mods/oreganized.pw.toml" +hash = "d88f9cd805c75c569a200729b5b5cdb842e343f3411646baa2e4e7c97e20a82c" +metafile = true + [[files]] file = "mods/owo-lib.pw.toml" hash = "28b3e0806647eb166e942cf6552993bb6d666949c53f0d51927bdfb063cb6cc4" diff --git a/mods/oreganized.pw.toml b/mods/oreganized.pw.toml new file mode 100644 index 0000000..b6a37af --- /dev/null +++ b/mods/oreganized.pw.toml @@ -0,0 +1,13 @@ +name = "Oreganized" +filename = "Oreganized-2.0.3-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/2FJutzEL/versions/9KLOnNlG/Oreganized-2.0.3-fabric.jar" +hash-format = "sha1" +hash = "f3cb4315dacac6e4b7f1e9039a6a55771133c3fe" + +[update] +[update.modrinth] +mod-id = "2FJutzEL" +version = "9KLOnNlG" diff --git a/pack.toml b/pack.toml index 5ad5387..9486d21 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 = "b9f396b218382f335b6726b06346a0c4ccf0af1fcf9c1dfe77bd921d72a5f3c0" +hash = "5813bbbfaff251c544623943819741d579b678aed85adb76e8b8cd794ad098c0" [versions] fabric = "0.16.5" From 77b47a6bef8921a4c62f38c4b19264b0dc0ee37b Mon Sep 17 00:00:00 2001 From: Violet-Scarelli Date: Tue, 26 Nov 2024 13:25:09 -0800 Subject: [PATCH 19/23] don't actually need this --- index.toml | 5 ----- mods/oreganized.pw.toml | 13 ------------- pack.toml | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 mods/oreganized.pw.toml diff --git a/index.toml b/index.toml index ef35f08..ff8d784 100644 --- a/index.toml +++ b/index.toml @@ -1565,11 +1565,6 @@ file = "mods/optigui.pw.toml" hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05" metafile = true -[[files]] -file = "mods/oreganized.pw.toml" -hash = "d88f9cd805c75c569a200729b5b5cdb842e343f3411646baa2e4e7c97e20a82c" -metafile = true - [[files]] file = "mods/owo-lib.pw.toml" hash = "28b3e0806647eb166e942cf6552993bb6d666949c53f0d51927bdfb063cb6cc4" diff --git a/mods/oreganized.pw.toml b/mods/oreganized.pw.toml deleted file mode 100644 index b6a37af..0000000 --- a/mods/oreganized.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Oreganized" -filename = "Oreganized-2.0.3-fabric.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/2FJutzEL/versions/9KLOnNlG/Oreganized-2.0.3-fabric.jar" -hash-format = "sha1" -hash = "f3cb4315dacac6e4b7f1e9039a6a55771133c3fe" - -[update] -[update.modrinth] -mod-id = "2FJutzEL" -version = "9KLOnNlG" diff --git a/pack.toml b/pack.toml index 9486d21..5ad5387 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 = "5813bbbfaff251c544623943819741d579b678aed85adb76e8b8cd794ad098c0" +hash = "b9f396b218382f335b6726b06346a0c4ccf0af1fcf9c1dfe77bd921d72a5f3c0" [versions] fabric = "0.16.5" From 074144797ec29a8e1bac9237152e442335a7fea8 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Wed, 27 Nov 2024 07:52:35 +0000 Subject: [PATCH 20/23] Add Seasons Compat --- index.toml | 40 +++- .../biome/lesser_color_change_biomes.json | 7 + .../tags/worldgen/biome/tropical_biomes.json | 18 ++ kubejs/server_scripts/tags.js | 188 +++++++++++++++++- mods/demanding-saplings.pw.toml | 13 -- mods/enhanced-weather.pw.toml | 13 -- mods/farmers-cutting-promenade.pw.toml | 13 ++ mods/ns-fd-rc.pw.toml | 13 ++ mods/seasonhud-fabric.pw.toml | 13 ++ mods/yetjustanothersilver.pw.toml | 13 ++ pack.toml | 4 +- 11 files changed, 294 insertions(+), 41 deletions(-) create mode 100644 kubejs/data/sereneseasons/tags/worldgen/biome/lesser_color_change_biomes.json create mode 100644 kubejs/data/sereneseasons/tags/worldgen/biome/tropical_biomes.json delete mode 100644 mods/demanding-saplings.pw.toml delete mode 100644 mods/enhanced-weather.pw.toml create mode 100644 mods/farmers-cutting-promenade.pw.toml create mode 100644 mods/ns-fd-rc.pw.toml create mode 100644 mods/seasonhud-fabric.pw.toml create mode 100644 mods/yetjustanothersilver.pw.toml diff --git a/index.toml b/index.toml index ff8d784..56dcdb6 100644 --- a/index.toml +++ b/index.toml @@ -501,6 +501,14 @@ hash = "45d26a6d873bea2dbb9b693865225b218050b3cd61e11a3118c53c6814ed6e3c" file = "kubejs/data/minecraft/recipes/shulker_box.json" hash = "ddec276786d2a9082eb9376604cccb1fce7694d9d15ce4e6bacf95ccf1c650da" +[[files]] +file = "kubejs/data/sereneseasons/tags/worldgen/biome/lesser_color_change_biomes.json" +hash = "1abc6a883070cc03bdc243a8c3d5a5855ddb10c7c0f0aa74c53331fb0617e658" + +[[files]] +file = "kubejs/data/sereneseasons/tags/worldgen/biome/tropical_biomes.json" +hash = "fd27e8fbdb10c4d1a707e8a85626849af36eedaa770f3e14d150f80bf9328aaf" + [[files]] file = "kubejs/data/spelunkery/loot_tables/gameplay/sluice/lava/passive.json" hash = "e4a27bee2c336a8f69cd0fc35dd9c254ab7746e19b9992588e9322e6cb47cca4" @@ -611,7 +619,7 @@ hash = "d54f1fb3afc2f8560ee5032fe5684deee96de51e2e194fcee6f00b28c35f6c86" [[files]] file = "kubejs/server_scripts/tags.js" -hash = "f1b788c37e03ff03bdef3181599a9fcc9c4dd4d6c010942f6042962e2cf304d1" +hash = "bd528d9e9a3fe1568d346558e077823e97f06baf03e0ffde0113f39ac465871f" [[files]] file = "kubejs/startup_scripts/vivvys_arcane_arsenal.js" @@ -1000,11 +1008,6 @@ file = "mods/delightful-creators-fabric.pw.toml" hash = "8e0d1ccb359215aea3bb724edf7a3c8537bfcb8403153dc8cf39e3e76e9e7e8c" metafile = true -[[files]] -file = "mods/demanding-saplings.pw.toml" -hash = "9623eaa32af4617924dc93ff654f824b6bf583775b81116e341d0be8c9ad1494" -metafile = true - [[files]] file = "mods/detail-armor-bar.pw.toml" hash = "89d22d515a1b5b1349b21eaa191a00bf529acca7673ba6af27dfda0380abea2b" @@ -1065,11 +1068,6 @@ file = "mods/enhanced-groups.pw.toml" hash = "d1c3e8626b56c91b98a0d0472b00fcc6b890006bed3b3b6aba0899d260debc27" metafile = true -[[files]] -file = "mods/enhanced-weather.pw.toml" -hash = "8e8c7dbc64b07e88e4e7f19b88bf9e5d8f97cac3082fdac76f2ef5e0f7be658c" -metafile = true - [[files]] file = "mods/entity-model-features.pw.toml" hash = "2beb95d8ff5770b423a562d408305b92c20b873a1d3b56f059d2837ea61fbbe4" @@ -1135,6 +1133,11 @@ file = "mods/fancymenu.pw.toml" hash = "07da47dfb249a468557efd171c659308ada855a343bfb3f531d6e4c05ed8bca0" metafile = true +[[files]] +file = "mods/farmers-cutting-promenade.pw.toml" +hash = "7e3d599f8c8ea528a719950aa538e56908e010b378e9bf57afb98cead652196d" +metafile = true + [[files]] file = "mods/farmers-delight-refabricated.pw.toml" hash = "d7f5c29f51b6e866f2227936ca124123ef5794813b791faf04d9fa66723bf2ff" @@ -1530,6 +1533,11 @@ file = "mods/ns-cr-rc.pw.toml" hash = "1a6fe5303c71f2c1cd0a412caf918024e5753b9bc31661eaea38b0071f8770fe" metafile = true +[[files]] +file = "mods/ns-fd-rc.pw.toml" +hash = "3ddeef7e97f806fe523d6cef0e5ba61807ec28e73bbbee622817035cf46009ff" +metafile = true + [[files]] file = "mods/nullscape.pw.toml" hash = "8d93d1db086d63d10edb0a3ad6926aeb6e6aab8985ff3a7eac1ec313ebce4420" @@ -1702,6 +1710,11 @@ file = "mods/searchables.pw.toml" hash = "5d694c42e5e6759807f1f5756de3dd24f098517143b8d8aac5721b7d5cf502b1" metafile = true +[[files]] +file = "mods/seasonhud-fabric.pw.toml" +hash = "6ab1aba56bbf182c5e1f0b0f1d5503b305e9f9e165cb4805d9cad9354ef2bf4d" +metafile = true + [[files]] file = "mods/serene-seasons.pw.toml" hash = "d5d7b7d8ddc60eac234033a30c8980a6d2d1ea07a0da45faabf82026432799a8" @@ -1917,6 +1930,11 @@ file = "mods/yacl.pw.toml" hash = "e012c2d48d8c2ef08e8a77a83476db46a81f9a5ee3aa90e5c57e2af508bd9089" metafile = true +[[files]] +file = "mods/yetjustanothersilver.pw.toml" +hash = "c9bbe58ea720c69fbd3bcfcf90e3b27deea02fabecb836337afb88efd825a815" +metafile = true + [[files]] file = "mods/yosbr.pw.toml" hash = "6f6334f336a876088431df70e2bba6ac52ca2ddeb73a4880ce88d6954b09af00" diff --git a/kubejs/data/sereneseasons/tags/worldgen/biome/lesser_color_change_biomes.json b/kubejs/data/sereneseasons/tags/worldgen/biome/lesser_color_change_biomes.json new file mode 100644 index 0000000..6d09979 --- /dev/null +++ b/kubejs/data/sereneseasons/tags/worldgen/biome/lesser_color_change_biomes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "natures_spirit:marsh", + "promenade:carnelian_treeway" + ] + } \ No newline at end of file diff --git a/kubejs/data/sereneseasons/tags/worldgen/biome/tropical_biomes.json b/kubejs/data/sereneseasons/tags/worldgen/biome/tropical_biomes.json new file mode 100644 index 0000000..6f754fb --- /dev/null +++ b/kubejs/data/sereneseasons/tags/worldgen/biome/tropical_biomes.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "natures_spirit:arid_savanna", + "natures_spirit:oak_savanna", + "natures_spirit:shrubland", + "natures_spirit:bamboo_wetlands", + "natures_spirit:drylands", + "natures_spirit:tropical_woods", + "natures_spirit:tropical_basin", + "natures_spirit:tropical_shores", + "natures_spirit:stratified_desert", + "natures_spirit:sparse_tropical_woods", + "natures_spirit:scorched_dunes", + "natures_spirit:xeric_plains", + "natures_spirit:dusty_slopes" + ] + } \ No newline at end of file diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index 592abf1..43a3f30 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -64,6 +64,110 @@ ServerEvents.tags("block", (event) => { non_movable.forEach((id) => { event.add("create:non_movable", id); }); + + // Serene Seasons - Crop Block Tags + const crops = { + spring: [ + "farmersrespite:small_tea_bush", + "farmersrespite:tea_bush", + "promenade:blush_sakura_sapling", + "promenade:cotton_sakura_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:willow_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:cypress_sapling", + "natures_spirit:saxual_sapling", + "natures_spirit:mahogany_sapling", + "natures_spirit:yellow_larch_sapling", + "natures_spirit:larch_sapling", + "promenade:blueberry_bush" + ], + summer: [ + "farmersrespite:small_tea_bush", + "farmersrespite:tea_bush", + "farmersrespite:coffee_bush", + "farmersrespite:coffee_bush_top", + "farmersrespite:coffee_stem", + "farmersrespite:coffee_stem_double", + "promenade:palm_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:willow_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:olive_sapling", + "natures_spirit:ghaf_sapling", + "natures_spirit:cypress_sapling", + "natures_spirit:joshua_sapling", + "natures_spirit:palo_verde_sapling", + "natures_spirit:saxual_sapling", + "natures_spirit:mahogany_sapling", + "tropics:palm_sapling", + "natures_spirit:yellow_larch_sapling", + "natures_spirit:larch_sapling", + "promenade:blueberry_bush" + ], + autumn: [ + "farmersrespite:small_tea_bush", + "farmersrespite:tea_bush", + "minecraft:potatoes", + "promenade:sap_maple_sapling", + "promenade:vermilion_maple_sapling", + "promenade:fulvous_maple_sapling", + "promenade:mikado_maple_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:red_maple_sapling", + "natures_spirit:orange_maple_sapling", + "natures_spirit:yellow_maple_sapling", + "natures_spirit:mahogany_sapling" + ], + yearRound: [ + "spelunkery:conk_fungus", + "spelunkery:button_mushroom", + "spelunkery:inkcap_mushroom", + "spelunkery:white_inkcap_mushroom", + "spelunkery:shiitake_mushroom", + "natures_spirit:redwood_sapling", + "natures_spirit:sugi_sapling", + "natures_spirit:cedar_sapling", + "promenade:dark_amaranth_fungus" + ] + }; + + Object.entries(crops).forEach(([season, crops]) => { + crops.forEach((crop) => { + event.add(`sereneseasons:${season}_crops`, crop) + }); + }); + + crops.yearRound.forEach((crop) => { + event.add(`sereneseasons:spring_crops`, crop) + event.add(`sereneseasons:summer_crops`, crop) + event.add(`sereneseasons:autumn_crops`, crop) + event.add(`sereneseasons:winter_crops`, crop) + }); + + // Serene Seasons - Greenhouse Glass Block Tags + const colours = ["white", "light_gray", "gray", "black", "brown", "red", "orange", "yellow", + "lime", "green", "cyan", "light_blue", "blue", "purple", "magenta", "pink"]; + colours.forEach((colour) => { + event.add("c:glass_blocks", `#chipped:${colour}_stained_glass`) + event.add("c:glass_blocks", `consistency_plus:${colour}_tinted_glass`) + }) + + const crystalClearVariants = ["brass", "copper", "andesite", "train"]; + crystalClearVariants.forEach((variant) => { + event.add("c:glass_blocks", `crystal_clear:${variant}_glass_casing`) + event.add("c:glass_blocks", `crystal_clear:${variant}_clear_glass_casing`) + }); + + const miscGlass = ["chipped:glass_ochre_froglight", "chipped:glass_ocre_froglight", "chipped:glass_verdant_froglight", + "chipped:glass_pearlescent_froglight", "tconstruct:clear_glass", "tconstruct:clear_tinted_glass", "tconstruct:soul_glass", + "tconstruct:scorched_glass", "tconstruct:seared_glass" + ]; + miscGlass.forEach((item) => { + event.add("c:glass_blocks", item) + }); + event.add("c:glass_blocks", "#chipped:glass"); }); ServerEvents.tags("fluid", (event) => { @@ -73,7 +177,8 @@ ServerEvents.tags("fluid", (event) => { }); ServerEvents.tags("item", (event) => { - const ingots = ["copper", "brass", "zinc", "gold"]; + // Ore tags + const ingots = ["copper", "brass", "zinc", "gold", "silver"]; ingots.forEach((material) => { event.add(`forge:nuggets/${material}`, `#c:${material}_nuggets`) @@ -81,5 +186,84 @@ ServerEvents.tags("item", (event) => { event.add(`forge:plates/${material}`, `#c:${material}_plates`) event.add(`forge:blocks/${material}`, `#c:${material}_blocks`) }); - event.add('c:silver_ingots', '#c:brass_ingots') + + // Serene Seasons - Crop Item Tags + const crops = { + spring: [ + "farmersrespite:tea_seeds", + "minecraft:beetroot_seeds", + "promenade:blush_sakura_sapling", + "promenade:cotton_sakura_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:willow_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:cypress_sapling", + "natures_spirit:saxual_sapling", + "natures_spirit:mahogany_sapling", + "natures_spirit:yellow_larch_sapling", + "natures_spirit:larch_sapling", + "promenade:blueberries" + ], + summer: [ + "farmersrespite:tea_seeds", + "farmersrespite:coffee_berries", + "promenade:palm_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:willow_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:olive_sapling", + "natures_spirit:ghaf_sapling", + "natures_spirit:cypress_sapling", + "natures_spirit:joshua_sapling", + "natures_spirit:palo_verde_sapling", + "natures_spirit:saxual_sapling", + "natures_spirit:mahogany_sapling", + "tropics:palm_sapling", + "natures_spirit:yellow_larch_sapling", + "natures_spirit:larch_sapling", + "promenade:blueberries" + ], + autumn: [ + "farmersrespite:tea_seeds", + "minecraft:potato", + "promenade:sap_maple_sapling", + "promenade:vermilion_maple_sapling", + "promenade:fulvous_maple_sapling", + "promenade:mikado_maple_sapling", + "natures_spirit:fir_sapling", + "natures_spirit:aspen_sapling", + "natures_spirit:red_maple_sapling", + "natures_spirit:orange_maple_sapling", + "natures_spirit:yellow_maple_sapling", + "natures_spirit:mahogany_sapling" + ], + yearRound: [ + "spelunkery:conk_fungus", + "spelunkery:phosphor_fungus", + "spelunkery:button_mushroom", + "spelunkery:inkcap_mushroom", + "promenade:dark_amaranth_fungus", + "spelunkery:white_inkcap_mushroom", + "spelunkery:shiitake_mushroom", + "natures_spirit:redwood_sapling", + "natures_spirit:sugi_sapling", + "natures_spirit:cedar_sapling" + ] + } + + Object.entries(crops).forEach(([season, crops]) => { + crops.forEach((crop) => { + event.add(`sereneseasons:${season}_crops`, crop) + }); + }); + + crops.yearRound.forEach((crop) => { + event.add(`sereneseasons:spring_crops`, crop) + event.add(`sereneseasons:summer_crops`, crop) + event.add(`sereneseasons:autumn_crops`, crop) + event.add(`sereneseasons:winter_crops`, crop) + }); + + // Misc + event.add("c:seeds", "supplementaries:flax_seeds") }); diff --git a/mods/demanding-saplings.pw.toml b/mods/demanding-saplings.pw.toml deleted file mode 100644 index 44d5bd7..0000000 --- a/mods/demanding-saplings.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Demanding Saplings" -filename = "demandingsaplings-0.1.1.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/qvyoz8jh/versions/dZ454Ly3/demandingsaplings-0.1.1.jar" -hash-format = "sha1" -hash = "7c528d9dcab4b9f5ff9d08fd90d06bf22e4c6e89" - -[update] -[update.modrinth] -mod-id = "qvyoz8jh" -version = "dZ454Ly3" diff --git a/mods/enhanced-weather.pw.toml b/mods/enhanced-weather.pw.toml deleted file mode 100644 index d894f5e..0000000 --- a/mods/enhanced-weather.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Enhanced Weather" -filename = "enhancedweather-1.1-Alpha2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/NDrgrF35/versions/VzgOMMyW/enhancedweather-1.1-Alpha2.jar" -hash-format = "sha1" -hash = "d63f0774136566c60256a0e999f4a5a67667e46c" - -[update] -[update.modrinth] -mod-id = "NDrgrF35" -version = "VzgOMMyW" diff --git a/mods/farmers-cutting-promenade.pw.toml b/mods/farmers-cutting-promenade.pw.toml new file mode 100644 index 0000000..cd6c79c --- /dev/null +++ b/mods/farmers-cutting-promenade.pw.toml @@ -0,0 +1,13 @@ +name = "Farmer's Cutting: Promenade" +filename = "farmers-cutting-promenade-1.20.1-1.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/eAGs83gV/versions/8t819gxH/farmers-cutting-promenade-1.20.1-1.0.jar" +hash-format = "sha512" +hash = "bee4ee43bd562af78d91ac865d11c1eed1cebde13538306428c9add5f7056d22aed2fcc6fa4ec72de070280f7f22401f6253c93c1e99431b4ec3235ba5232f95" + +[update] +[update.modrinth] +mod-id = "eAGs83gV" +version = "8t819gxH" diff --git a/mods/ns-fd-rc.pw.toml b/mods/ns-fd-rc.pw.toml new file mode 100644 index 0000000..c67e257 --- /dev/null +++ b/mods/ns-fd-rc.pw.toml @@ -0,0 +1,13 @@ +name = "Nature's Spirit - Farmer's Delight Recipe Compat" +filename = "ns-fd-rc-0.1.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/bJTRwh2l/versions/8nTfo8uu/ns-fd-rc-0.1.0.jar" +hash-format = "sha512" +hash = "725958b212ed4332ff2a050c30142dba89cf9bc1ee865fe9778f808cd37a0c0cacbe317703860c4c8812a1bd579c5f1f1cb68e4a9a12e8336579ebff48b26606" + +[update] +[update.modrinth] +mod-id = "bJTRwh2l" +version = "8nTfo8uu" diff --git a/mods/seasonhud-fabric.pw.toml b/mods/seasonhud-fabric.pw.toml new file mode 100644 index 0000000..6c5baa4 --- /dev/null +++ b/mods/seasonhud-fabric.pw.toml @@ -0,0 +1,13 @@ +name = "SeasonHUD-Fabric" +filename = "seasonhud-fabric-1.20.1-1.11.5.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/iDiIfZLX/versions/sEp0s1oE/seasonhud-fabric-1.20.1-1.11.5.jar" +hash-format = "sha512" +hash = "6d0ec006afaf6af2871d2fd5f26d90c4b8ff75bb5f68aa596023143431f75ca3fd878a29cc2e217ba262c133e0b650be019941a9904fb85474f2f03a480da39f" + +[update] +[update.modrinth] +mod-id = "iDiIfZLX" +version = "sEp0s1oE" diff --git a/mods/yetjustanothersilver.pw.toml b/mods/yetjustanothersilver.pw.toml new file mode 100644 index 0000000..bed7034 --- /dev/null +++ b/mods/yetjustanothersilver.pw.toml @@ -0,0 +1,13 @@ +name = "YetJustAnotherSilver" +filename = "YetJustAnotherSilver-1.0.3.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/dsEsgw8u/versions/OsSNU3KG/YetJustAnotherSilver-1.0.3.jar" +hash-format = "sha512" +hash = "54be5f7d51dcb1c85ed49c561e2767fa3706fbc0daebd2b1b8a4e8c720d183e3a787080de29c9b95ed5c7bfed90f3f2d725b4fa2c4aa1207171a3b30c714d1c9" + +[update] +[update.modrinth] +mod-id = "dsEsgw8u" +version = "OsSNU3KG" diff --git a/pack.toml b/pack.toml index 5ad5387..c165368 100644 --- a/pack.toml +++ b/pack.toml @@ -1,12 +1,12 @@ name = "Steam 'n' Rails Modpack" author = "IThundxr" -version = "1.1.7" +version = "1.2.0" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "b9f396b218382f335b6726b06346a0c4ccf0af1fcf9c1dfe77bd921d72a5f3c0" +hash = "3e035eab8b863a2c6316e0eb89d819517f6a8a1c00e8a194daf42a49406dff09" [versions] fabric = "0.16.5" From 7bf1b61e07e8adcf479d43f0909ffecec702b404 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Wed, 27 Nov 2024 07:53:10 +0000 Subject: [PATCH 21/23] Refresh pack --- pack.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.toml b/pack.toml index c165368..e1f3e9e 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 = "3e035eab8b863a2c6316e0eb89d819517f6a8a1c00e8a194daf42a49406dff09" +hash = "cc753b0c2ec6695a8a8f769b81373b30023d7cf0642ec5cf7094e2c99ce5c8cf" [versions] fabric = "0.16.5" From 5236a85ceaafcc317eb8c852a067a13730434863 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Wed, 27 Nov 2024 07:58:41 +0000 Subject: [PATCH 22/23] Change season duration slightly --- config/sereneseasons/seasons.toml | 2 +- index.toml | 2 +- pack.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sereneseasons/seasons.toml b/config/sereneseasons/seasons.toml index b6532e1..d6639d0 100644 --- a/config/sereneseasons/seasons.toml +++ b/config/sereneseasons/seasons.toml @@ -21,7 +21,7 @@ #10 - 12 = Early/Mid/Late Winter starting_sub_season = 1 #The duration of a sub season in days. - sub_season_duration = 96 + sub_season_duration = 120 #If the season should progress on a server with no players online progress_season_while_offline = true #The duration of a Minecraft day in ticks. diff --git a/index.toml b/index.toml index 5f0e676..c85f975 100644 --- a/index.toml +++ b/index.toml @@ -267,7 +267,7 @@ hash = "722f7545a5a592f0aed25ae8dd0a4f53f7abaf0bb53da96417d87e9096e75631" [[files]] file = "config/sereneseasons/seasons.toml" -hash = "9a4e136103db2a7922d075a75f8c4a9980f62d32b0b2e412d9e3c1ba5be03ae6" +hash = "ffae37360859373a38c179948293afefc98285aa559b381011d9b68bbb4f78ca" [[files]] file = "config/servercore/config.yml" diff --git a/pack.toml b/pack.toml index e1f3e9e..6566ea5 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 = "cc753b0c2ec6695a8a8f769b81373b30023d7cf0642ec5cf7094e2c99ce5c8cf" +hash = "b0f007869975b0d882be3d5d0d3db441353cf97cea82fa6fd362536ad6463391" [versions] fabric = "0.16.5" From c191282fc742a720af37524e265ec54eb3306bc0 Mon Sep 17 00:00:00 2001 From: Sleepy Evelyn <46009144+sleepy-evelyn@users.noreply.github.com> Date: Wed, 27 Nov 2024 08:13:47 +0000 Subject: [PATCH 23/23] Re add Demanding Saplings lol --- index.toml | 5 +++++ mods/demanding-saplings.pw.toml | 13 +++++++++++++ pack.toml | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mods/demanding-saplings.pw.toml diff --git a/index.toml b/index.toml index c85f975..29bb331 100644 --- a/index.toml +++ b/index.toml @@ -1008,6 +1008,11 @@ file = "mods/delightful-creators-fabric.pw.toml" hash = "8e0d1ccb359215aea3bb724edf7a3c8537bfcb8403153dc8cf39e3e76e9e7e8c" metafile = true +[[files]] +file = "mods/demanding-saplings.pw.toml" +hash = "929d888d60b3ea1e80733954aa829c87850461ec6d9d02fbb7b0cf7f547208ab" +metafile = true + [[files]] file = "mods/detail-armor-bar.pw.toml" hash = "89d22d515a1b5b1349b21eaa191a00bf529acca7673ba6af27dfda0380abea2b" diff --git a/mods/demanding-saplings.pw.toml b/mods/demanding-saplings.pw.toml new file mode 100644 index 0000000..3e34eb6 --- /dev/null +++ b/mods/demanding-saplings.pw.toml @@ -0,0 +1,13 @@ +name = "Demanding Saplings" +filename = "demandingsaplings-0.1.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/qvyoz8jh/versions/dZ454Ly3/demandingsaplings-0.1.1.jar" +hash-format = "sha512" +hash = "cdf3ae899722ddf543f9aa496c70b63ca763e09f092b3560ce7f6071fdab6fc779b3cd377c15ec7e8e6fd55f684e3ed723eaf80f3026bf290dee5f88d4e54938" + +[update] +[update.modrinth] +mod-id = "qvyoz8jh" +version = "dZ454Ly3" diff --git a/pack.toml b/pack.toml index 6566ea5..029c22d 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 = "b0f007869975b0d882be3d5d0d3db441353cf97cea82fa6fd362536ad6463391" +hash = "ebbec5118dac9b5c0b0238a6a37e3a2ad67428a9ff4bc6b2e5a4a0d9049291b2" [versions] fabric = "0.16.5"