diff --git a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/armor_fail.ogg b/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/armor_fail.ogg deleted file mode 100644 index ec45eed..0000000 Binary files a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/armor_fail.ogg and /dev/null differ diff --git a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/bow_fail.ogg b/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/bow_fail.ogg deleted file mode 100644 index ec45eed..0000000 Binary files a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/bow_fail.ogg and /dev/null differ diff --git a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/hoe_fail.ogg b/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/hoe_fail.ogg deleted file mode 100644 index ec45eed..0000000 Binary files a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/hoe_fail.ogg and /dev/null differ diff --git a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/sword_fail.ogg b/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/sword_fail.ogg deleted file mode 100644 index ec45eed..0000000 Binary files a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/sword_fail.ogg and /dev/null differ diff --git a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/tool_fail.ogg b/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/tool_fail.ogg deleted file mode 100644 index ec45eed..0000000 Binary files a/config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/tool_fail.ogg and /dev/null differ diff --git a/config/paxi/resourcepacks/FUCK/pack.mcmeta b/config/paxi/resourcepacks/FUCK/pack.mcmeta deleted file mode 100644 index 6674727..0000000 --- a/config/paxi/resourcepacks/FUCK/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 9, - "description": "FUCK" - } -} diff --git a/config/survivalistessentials-client.toml b/config/survivalistessentials-client.toml deleted file mode 100644 index 6f08443..0000000 --- a/config/survivalistessentials-client.toml +++ /dev/null @@ -1,3 +0,0 @@ -#Enables the fail sound if using the wrong tool. -ENABLE_FAIL_SOUND = true - diff --git a/config/survivalistessentials-common.toml b/config/survivalistessentials-common.toml deleted file mode 100644 index bd9a479..0000000 --- a/config/survivalistessentials-common.toml +++ /dev/null @@ -1,48 +0,0 @@ -#RockGeneration frequency. (1 = low, 5 = all over) -#Range: 1 ~ 5 -ROCK_GEN_FREQUENCY = 2 -#Chance for a successful flint knapping. (1.0 = 100%, 0.4 = 40%, etc.) -#Range: 0.1 ~ 1.0 -FLINT_CHANCE = 0.6 -#Heal rate for bandages. Crude bandages are 50% less effective. (1.0 = 100%, 0.4 = 40%, etc.) -#Range: 0.1 ~ 1.0 -HEAL_RATE = 0.14 -#Slowdown speed when using incorrect tool. -#Range: 0.1 ~ 1.0 -SLOW_DOWN_SPEED = 0.4 -#Inverts blacklist to be whitelist. This allows for immersion mods/modpacks to only allow tools or armor for specific mods. Default: false -INVERT_LIST_TO_WHITELIST = false -#List of mods that tools will become wet noodles. If inverted, acts as a whitelist. Default: [""] -mods = ["minecraft"] -#List of individual tools that will always work. Format tooltype-modid:item Default: [""] -items = ["minecraft:air"] -#Used to dump log info for Survivalist Essentials Modpack. Ignore. -LOG_MODPACK_DATA = false -#List of mods that have blocks that are generally decorative in nature and require no tool for harvesting blocks. Default: ["comforts"] -blockmods = ["comforts"] -#Hunger penalty feature. If after dying, player is rewarded with reduced hunger levels. -ENABLE_HUNGER_PENALTY = false -#Hunger value after death in half shanks. (0 = Really? That's just cruel, 20 = No penalty.) -#Range: 0 ~ 20 -HUNGER = 8 -#Saturation value after death. Range 0 to 20. -#Range: 0 ~ 20 -SATURATION = 0 -#Health penalty feature. If after dying, player is rewarded with reduced health levels. -ENABLE_HEALTH_PENALTY = false -#Health value after death in half hearts. -#Range: 0.5 ~ 100.0 -HEALTH = 6.0 -#Health penalty in half hearts player starts with. Reduces total starting health by this amount. -#Range: 0.0 ~ 19.0 -STARTING_HEALTH_PENALTY = 0.0 -#The amount of generic damage in half hearts a disabled tool, or bare hand should do. Default 0 -#Range: 0 ~ 4 -GENERIC_DAMAGE = 0 -#List of mods that armor will not be equipable for. If inverted, acts as a whitelist. Default: [""] -armormods = ["minecraft"] -#List of individual armor items that will be disabled. If inverted, acts as a whitelist. Format modid:item Default: [""] -armor = [] -#List of tags when added to tools or armor will be disabled. If inverted, acts as a whitelist.["blacklist_tools"] -tag = ["blacklist_tools"] - diff --git a/index.toml b/index.toml index ac35a5a..9dfad15 100644 --- a/index.toml +++ b/index.toml @@ -260,30 +260,6 @@ hash = "bd2a241fb29cdb0f8ad2da103d7502e198dd759d3db6c91c0c46c40f7b49d72a" file = "config/paxi/resourcepack_load_order.json" hash = "d0aaf3172f34275479f0669aa5b0a94b85788ae638f3062b948ec49d31c38293" -[[files]] -file = "config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/armor_fail.ogg" -hash = "a809928e33f04227362b6f2f0f5f90955caa65867742acaaf963192aeb6bea3a" - -[[files]] -file = "config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/bow_fail.ogg" -hash = "a809928e33f04227362b6f2f0f5f90955caa65867742acaaf963192aeb6bea3a" - -[[files]] -file = "config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/hoe_fail.ogg" -hash = "a809928e33f04227362b6f2f0f5f90955caa65867742acaaf963192aeb6bea3a" - -[[files]] -file = "config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/sword_fail.ogg" -hash = "a809928e33f04227362b6f2f0f5f90955caa65867742acaaf963192aeb6bea3a" - -[[files]] -file = "config/paxi/resourcepacks/FUCK/assets/survivalistessentials/sounds/tool_fail.ogg" -hash = "a809928e33f04227362b6f2f0f5f90955caa65867742acaaf963192aeb6bea3a" - -[[files]] -file = "config/paxi/resourcepacks/FUCK/pack.mcmeta" -hash = "db65440d6cf073bf655116d5ec197736453d28f143b684e4df5bc0a822b61234" - [[files]] file = "config/personality-client.toml" hash = "b1f773cc87cd02fc632dd37a1cde0c510076f07a2fac6d2e8c31bcc66cc0bc84" @@ -328,14 +304,6 @@ hash = "b25372a3bf1a5caebd9ce9d965c112e1c3f35df7e334174dce7796dbfbbe401f" file = "config/spark/config.json" hash = "992ba9f3a4a7ce3de112eb95575328956fdc3ce6781c455ebce7b23db7e7da42" -[[files]] -file = "config/survivalistessentials-client.toml" -hash = "1826033d0adb57af8a8ec1605bb3fcbbec3f7b0d478378c903ba1f7a2cb535e8" - -[[files]] -file = "config/survivalistessentials-common.toml" -hash = "23d897c03a1195b09475db4a585c2d60acdb33f622eab63c175a4b286af01bd8" - [[files]] file = "config/tconstruct-client.toml" hash = "cda2bd5471e0c6b28233f7c59b828433a2611f63c214ce35341315c993627dbc" @@ -432,6 +400,22 @@ hash = "5f590261736d21d764ba5df2495533af65b218d4983290b4d2f6b967abc2369a" file = "config/waila/waila_plugins.json" hash = "4dd70b6a4dcde535bc736b2f57a226c19f25fd5d3045e683b984bd2851c48bea" +[[files]] +file = "kubejs/client_scripts/tinkersight.js" +hash = "c22f814b02477aa0190a20a9290629f4e52854d150e2a0d854aa80229d26c984" + +[[files]] +file = "kubejs/config/common.properties" +hash = "f17bdb6d5bd776179bc29b15b19dcccfe5b8a731ff81a28abfd4cfe02db4ee62" + +[[files]] +file = "kubejs/server_scripts/tinkerban.js" +hash = "5c081cc05d652810a05e63bb0729a69abd3e1d440e6a448ede63b2acd02f919e" + +[[files]] +file = "kubejs/startup_scripts/tinkermode.js" +hash = "e36f278847bca8ce8115a39e7ded7838fc8e003fccc9016a2c18fb14ac7bcf1d" + [[files]] file = "mods/3dskinlayers.pw.toml" hash = "f26fb3ebc03df700a9af26fa5084b2034b1ce5ede156f5112aedb6a4e14162cb" @@ -762,11 +746,6 @@ file = "mods/spark.pw.toml" hash = "61799bc6367ee86a72fe54b131576cbbc6f4dbe1a1a134d561e83b02a72691be" metafile = true -[[files]] -file = "mods/survivalist-essentials.pw.toml" -hash = "18c36fae2b5d69f41ca8fbf42ee5588c375c5be72a65f69d3189dee2e9e7c54a" -metafile = true - [[files]] file = "mods/tectonic.pw.toml" hash = "47019e47b626d84015f42fd6bf5702cfd95b0dd507fd32618792933521ae498b" @@ -787,11 +766,6 @@ file = "mods/tinkers-construct.pw.toml" hash = "8fb06ece06447c992a862fa579f06ff9e613ac6ee45a1270f1c925a717f6c26b" metafile = true -[[files]] -file = "mods/tinkersurvival.pw.toml" -hash = "4ed81e7085f389a0a6afde43444c4f7f0633e412e795330f5521042914c92ad3" -metafile = true - [[files]] file = "mods/toms-storage.pw.toml" hash = "e50b78b778eb934e533f81ea558fe6437dde018b6b520ff3e94661c0ec8e7f79" diff --git a/kubejs/client_scripts/tinkersight.js b/kubejs/client_scripts/tinkersight.js new file mode 100644 index 0000000..25e6d55 --- /dev/null +++ b/kubejs/client_scripts/tinkersight.js @@ -0,0 +1,105 @@ +const tools = [ + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:iron_axe", + "minecraft:diamond_axe", + "minecraft:golden_axe", + "minecraft:netherite_axe", + "caverns_and_chasms:silver_axe", + "caverns_and_chasms:necromium_axe", + "minecraft:wooden_shovel", + "minecraft:stone_shovel", + "minecraft:iron_shovel", + "minecraft:diamond_shovel", + "minecraft:golden_shovel", + "minecraft:netherite_shovel", + "caverns_and_chasms:silver_shovel", + "caverns_and_chasms:necromium_shovel", + "minecraft:wooden_hoe", + "minecraft:stone_hoe", + "minecraft:iron_hoe", + "minecraft:golden_hoe", + "minecraft:diamond_hoe", + "minecraft:netherite_hoe", + "caverns_and_chasms:silver_hoe", + "caverns_and_chasms:necromium_hoe", + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe", + "caverns_and_chasms:silver_pickaxe", + "caverns_and_chasms:necromium_pickaxe", + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:iron_sword", + "minecraft:golden_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword", + "caverns_and_chasms:silver_sword", + "caverns_and_chasms:necromium_sword", + "minecraft:shield", + "minecraft:bow", + "minecraft:crossbow", + "minecraft:fishing_rod", + "minecraft:trident", + "quark:pickarang", + "quark:flamerang", + "quark:echorang" +] + +const armors = [ + "environmental:thief_hood", + "minecraft:leather_helmet", + "minecraft:turtle_helmet", + "minecraft:chainmail_helmet", + "minecraft:iron_helmet", + "minecraft:golden_helmet", + "minecraft:diamond_helmet", + "minecraft:netherite_helmet", + "caverns_and_chasms:silver_helmet", + "caverns_and_chasms:necromium_helmet", + "caverns_and_chasms:sanguine_helmet", + "quark:forgotten_hat", + "environmental:healer_pouch", + "minecraft:leather_chestplate", + "minecraft:chainmail_chestplate", + "minecraft:iron_chestplate", + "minecraft:golden_chestplate", + "minecraft:diamond_chestplate", + "minecraft:netherite_chestplate", + "caverns_and_chasms:silver_chestplate", + "caverns_and_chasms:necromium_chestplate", + "caverns_and_chasms:sanguine_chestplate", + "environmental:architect_belt", + "environmental:yak_pants", + "minecraft:leather_leggings", + "minecraft:chainmail_leggings", + "minecraft:iron_leggings", + "minecraft:golden_leggings", + "minecraft:diamond_leggings", + "minecraft:netherite_leggings", + "caverns_and_chasms:silver_leggings", + "caverns_and_chasms:necromium_leggings", + "caverns_and_chasms:sanguine_leggings", + "environmental:wanderer_boots", + "minecraft:leather_boots", + "minecraft:chainmail_boots", + "minecraft:iron_boots", + "minecraft:golden_boots", + "minecraft:diamond_boots", + "minecraft:netherite_boots", + "caverns_and_chasms:silver_boots", + "caverns_and_chasms:necromium_boots", + "caverns_and_chasms:sanguine_boots" +] + +ItemEvents.tooltip(tooltip => { + tools.forEach(tool => { + tooltip.add(tool, "§4But that's not a construct, is it?"); + }); + armors.forEach(armor => { + tooltip.add(armor, "§4Tinker will not tolerate this."); + }); +}); \ No newline at end of file diff --git a/kubejs/config/common.properties b/kubejs/config/common.properties new file mode 100644 index 0000000..51fd4d1 --- /dev/null +++ b/kubejs/config/common.properties @@ -0,0 +1,12 @@ +#KubeJS Common Properties +#Wed May 22 21:46:13 CDT 2024 +allowAsyncStreams=false +announceReload=true +hideServerScriptErrors=false +ignoreCustomUniqueRecipeIds=false +matchJsonRecipes=true +packmode= +saveDevPropertiesInConfig=false +serverOnly=false +startupErrorGUI=true +startupErrorReportUrl= diff --git a/kubejs/server_scripts/tinkerban.js b/kubejs/server_scripts/tinkerban.js new file mode 100644 index 0000000..e2de0ef --- /dev/null +++ b/kubejs/server_scripts/tinkerban.js @@ -0,0 +1,4 @@ +ServerEvents.recipes(event => { + event.remove({ output: "#forge:tools" }); + event.remove({ output: "#forge:armors" }); +}); \ No newline at end of file diff --git a/kubejs/startup_scripts/tinkermode.js b/kubejs/startup_scripts/tinkermode.js new file mode 100644 index 0000000..7e5a3b3 --- /dev/null +++ b/kubejs/startup_scripts/tinkermode.js @@ -0,0 +1,117 @@ +const tools = [ + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:iron_axe", + "minecraft:diamond_axe", + "minecraft:golden_axe", + "minecraft:netherite_axe", + "caverns_and_chasms:silver_axe", + "caverns_and_chasms:necromium_axe", + "minecraft:wooden_shovel", + "minecraft:stone_shovel", + "minecraft:iron_shovel", + "minecraft:diamond_shovel", + "minecraft:golden_shovel", + "minecraft:netherite_shovel", + "caverns_and_chasms:silver_shovel", + "caverns_and_chasms:necromium_shovel", + "minecraft:wooden_hoe", + "minecraft:stone_hoe", + "minecraft:iron_hoe", + "minecraft:golden_hoe", + "minecraft:diamond_hoe", + "minecraft:netherite_hoe", + "caverns_and_chasms:silver_hoe", + "caverns_and_chasms:necromium_hoe", + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe", + "caverns_and_chasms:silver_pickaxe", + "caverns_and_chasms:necromium_pickaxe", + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:iron_sword", + "minecraft:golden_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword", + "caverns_and_chasms:silver_sword", + "caverns_and_chasms:necromium_sword", + "minecraft:shield", + "minecraft:bow", + "minecraft:crossbow", + "minecraft:fishing_rod", + "minecraft:trident", + "quark:pickarang", + "quark:flamerang", + "quark:echorang" +] + +const armors = [ + "environmental:thief_hood", + "minecraft:leather_helmet", + "minecraft:turtle_helmet", + "minecraft:chainmail_helmet", + "minecraft:iron_helmet", + "minecraft:golden_helmet", + "minecraft:diamond_helmet", + "minecraft:netherite_helmet", + "caverns_and_chasms:silver_helmet", + "caverns_and_chasms:necromium_helmet", + "caverns_and_chasms:sanguine_helmet", + "quark:forgotten_hat", + "environmental:healer_pouch", + "minecraft:leather_chestplate", + "minecraft:chainmail_chestplate", + "minecraft:iron_chestplate", + "minecraft:golden_chestplate", + "minecraft:diamond_chestplate", + "minecraft:netherite_chestplate", + "caverns_and_chasms:silver_chestplate", + "caverns_and_chasms:necromium_chestplate", + "caverns_and_chasms:sanguine_chestplate", + "environmental:architect_belt", + "environmental:yak_pants", + "minecraft:leather_leggings", + "minecraft:chainmail_leggings", + "minecraft:iron_leggings", + "minecraft:golden_leggings", + "minecraft:diamond_leggings", + "minecraft:netherite_leggings", + "caverns_and_chasms:silver_leggings", + "caverns_and_chasms:necromium_leggings", + "caverns_and_chasms:sanguine_leggings", + "environmental:wanderer_boots", + "minecraft:leather_boots", + "minecraft:chainmail_boots", + "minecraft:iron_boots", + "minecraft:golden_boots", + "minecraft:diamond_boots", + "minecraft:netherite_boots", + "caverns_and_chasms:silver_boots", + "caverns_and_chasms:necromium_boots", + "caverns_and_chasms:sanguine_boots" +] + +ItemEvents.modification(event => { + //const whitelist = Ingredient.of(/minecraft:.*/); + + tools.forEach(tool => { + console.info(tool); + /*if (whitelist.test(tool)) { + console.info('pass'); + }*/ + event.modify(tool, item => { + item.maxDamage = 1; + }); + }); + + armors.forEach(armor => { + console.info(armor); + event.modify(armor, item => { + item.maxDamage = 1; + }); + }); +}); \ No newline at end of file diff --git a/mods/survivalist-essentials.pw.toml b/mods/survivalist-essentials.pw.toml deleted file mode 100644 index 6bc491b..0000000 --- a/mods/survivalist-essentials.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Survivalist Essentials" -filename = "SurvivalistEssentials-1.19.2-4.2.0.15.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/hFW7KOhm/versions/tyPRs9Fe/SurvivalistEssentials-1.19.2-4.2.0.15.jar" -hash-format = "sha1" -hash = "846a5848912115086f9e221e72ff4be956f81a0d" - -[update] -[update.modrinth] -mod-id = "hFW7KOhm" -version = "tyPRs9Fe" diff --git a/mods/tinkersurvival.pw.toml b/mods/tinkersurvival.pw.toml deleted file mode 100644 index 28d963c..0000000 --- a/mods/tinkersurvival.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Tinkers' Survival" -filename = "TinkerSurvival-1.19.2-4.1.1.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/KRi6s8j8/versions/6vBkyRPa/TinkerSurvival-1.19.2-4.1.1.2.jar" -hash-format = "sha1" -hash = "d7d0d5ec635857b5cc1c4840979fc65634fd98d3" - -[update] -[update.modrinth] -mod-id = "KRi6s8j8" -version = "6vBkyRPa" diff --git a/pack.toml b/pack.toml index a8ff68a..a264050 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 = "8f4e3c47ea9e888603e7de2a18e7ee38cc8a858f8ed418334bf90a7bd1bd9521" +hash = "bed938749b04d2b01a77bb7b368ba1d4ef1e67dc39650752774a5d6d3e3e03d5" [versions] forge = "43.3.13"