diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a1437..3c0a033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ +# 1.1.0 + +This will be the initial release for the production server. I will avoid adding new "content" from this point on, but config changes and QoL is still on the table. + +## Config Changes + +- Modified the starter kit to include the new shop block instead of the old one. + +## Mods + +### Removals + +- Simple Shops + - It functions fine, but it is out-classed by our new trading mod. + +### Additions + +- Chunky + - Allows OPs to pre-generate chunks. +- Tom's Trading Network + - A better trading mod for a server economy. + +### Updates + +- Create Crafts and Additions 1.19.2-20230411a -> 1.19.2-20230426a +- FastWorkbench 7.1.1 -> 7.1.2 +- SeasonHUD 1.4.12 -> 1.4.13 + # 1.0.19 ## Config Changes diff --git a/config/carryon-common.toml b/config/carryon-common.toml deleted file mode 100644 index 66245a2..0000000 --- a/config/carryon-common.toml +++ /dev/null @@ -1,79 +0,0 @@ - -[settings] - #General Settings - #Maximum distance from where Blocks and Entities can be picked up - #Range: 0.0 ~ 1.7976931348623157E308 - maxDistance = 2.5 - #Max width of entities that can be picked up in survival mode - #Range: 0.0 ~ 10.0 - maxEntityWidth = 1.5 - #Max height of entities that can be picked up in survival mode - #Range: 0.0 ~ 10.0 - maxEntityHeight = 2.5 - #Slowness multiplier for blocks - #Range: 0.0 ~ 1.7976931348623157E308 - blockSlownessMultiplier = 1.0 - #Slowness multiplier for entities - #Range: 0.0 ~ 1.7976931348623157E308 - entitySlownessMultiplier = 1.0 - #Maximum stack limit for entities - #Range: > 1 - maxEntityStackLimit = 10 - #More complex Tile Entities slow down the player more - heavyTiles = true - #Allow all blocks to be picked up, not just Tile Entites. White/Blacklist will still be respected. - pickupAllBlocks = false - #Whether Blocks and Entities slow the creative player down when carried - slownessInCreative = true - #Whether hostile mobs should be able to picked up in survival mode - pickupHostileMobs = false - #Larger Entities slow down the player more - heavyEntities = true - #Allow babies to be carried even when adult mob is blacklisted (or not whitelisted) - allowBabies = false - #Use Whitelist instead of Blacklist for Blocks - useWhitelistBlocks = false - #Use Whitelist instead of Blacklist for Entities - useWhitelistEntities = false - #Use Whitelist instead of Blacklist for Stacking - useWhitelistStacking = false - #Whether the player can hit blocks and entities while carrying or not - hitWhileCarrying = false - #Whether the player drops the carried object when hit or not - dropCarriedWhenHit = false - #Use custom Pickup Scripts. Having this set to false, will not allow you to run scripts, but will increase your performance - useScripts = false - #Allows entities to be stacked on top of each other - stackableEntities = true - #Whether entities' size matters when stacking or not. This means that larger entities cannot be stacked on smaller ones - entitySizeMattersStacking = true - #Usually all the block state information is retained when placing a block that was picked up. But some information is changed to a modified property, like rotation or orientation. In this list, add additional properties that should NOT be saved and instead be updated when placed. Format: modid:block[propertyname]. Note: You don't need to add an entry for every subtype of a same block. For example, we only add an entry for one type of slab, but the change is applied to all slabs. - placementStateExceptions = ["minecraft:chest[type]", "minecraft:stone_button[face]", "minecraft:vine[north,east,south,west,up]", "minecraft:creeper_head[rotation]", "minecraft:glow_lichen[north,east,south,west,up,down]", "minecraft:oak_sign[rotation]", "minecraft:oak_trapdoor[half]"] - #Whether Players can be picked up. Creative players can't be picked up in Survival Mode - pickupPlayers = true - -[whitelist] - #Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config - #Entities that CAN be picked up (useWhitelistEntities must be true) - allowedEntities = [] - #Blocks that CAN be picked up (useWhitelistBlocks must be true) - allowedBlocks = [] - #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) - allowedStacking = [] - -[blacklist] - #Blacklist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config - #Blocks that cannot be picked up - forbiddenTiles = ["#forge:immovable", "#forge:relocation_not_supported", "minecraft:end_portal", "minecraft:piston_head", "minecraft:end_gateway", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:peony", "minecraft:rose_bush", "minecraft:lilac", "minecraft:sunflower", "minecraft:*_bed", "minecraft:*_door", "minecraft:big_dripleaf_stem", "minecraft:waterlily", "minecraft:cake", "minecraft:nether_portal", "minecraft:tall_seagrass", "animania:block_trough", "animania:block_invisiblock", "colossalchests:*", "ic2:*", "bigreactors:*", "forestry:*", "tconstruct:*", "rustic:*", "botania:*", "astralsorcery:*", "quark:colored_bed_*", "immersiveengineering:*", "embers:block_furnace", "embers:ember_bore", "embers:ember_activator", "embers:mixer", "embers:heat_coil", "embers:large_tank", "embers:crystal_cell", "embers:alchemy_pedestal", "embers:boiler", "embers:combustor", "embers:catalzyer", "embers:field_chart", "embers:inferno_forge", "storagedrawers:framingtable", "skyresources:*", "lootbags:*", "exsartagine:*", "aquamunda:tank", "opencomputers:*", "malisisdoors:*", "industrialforegoing:*", "minecolonies:*", "thaumcraft:pillar*", "thaumcraft:infernal_furnace", "thaumcraft:placeholder*", "thaumcraft:infusion_matrix", "thaumcraft:golem_builder", "thaumcraft:thaumatorium*", "magneticraft:oil_heater", "magneticraft:solar_panel", "magneticraft:steam_engine", "magneticraft:shelving_unit", "magneticraft:grinder", "magneticraft:sieve", "magneticraft:solar_tower", "magneticraft:solar_mirror", "magneticraft:container", "magneticraft:pumpjack", "magneticraft:solar_panel", "magneticraft:refinery", "magneticraft:oil_heater", "magneticraft:hydraulic_press", "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "waystones:*", "contact:*", "framedblocks:*", "littlelogistics:*"] - #Entities that cannot be picked up - forbiddenEntities = ["minecraft:end_crystal", "minecraft:ender_dragon", "minecraft:ghast", "minecraft:shulker", "minecraft:leash_knot", "minecraft:armor_stand", "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*"] - #Entities that cannot have other entities stacked on top of them - forbiddenStacking = ["minecraft:horse"] - -[customPickupConditions] - #Custom Pickup Conditions. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Custom-Pickup-Condition-Config - #Custom Pickup Conditions for Blocks - customPickupConditionsBlocks = [] - #Custom Pickup Conditions for Entities - customPickupConditionsEntities = [] - diff --git a/config/fancymenu/customization/um-mainmenu.txt b/config/fancymenu/customization/um-mainmenu.txt index 66f5a0c..9b263bc 100755 --- a/config/fancymenu/customization/um-mainmenu.txt +++ b/config/fancymenu/customization/um-mainmenu.txt @@ -256,7 +256,7 @@ customization { enable_scrolling = true shadow = true scale = 1.0 - source = ScrumptiousCraft Um 1.0.19%n%Pack assembled by Raz%n%{"placeholder":"playeruuid"} + source = ScrumptiousCraft Um 1.1.0%n%Pack assembled by Raz%n%{"placeholder":"playeruuid"} text_border = 0 case_mode = normal source_mode = direct diff --git a/config/starterkit/starterkit.txt b/config/starterkit/starterkit.txt index 4d06a7d..1134d48 100644 --- a/config/starterkit/starterkit.txt +++ b/config/starterkit/starterkit.txt @@ -8,7 +8,7 @@ 2 : '{Count:1b,id:"minecraft:wooden_axe",tag:{Damage:0}}', 3 : '{Count:1b,id:"minecraft:white_bed"}', 4 : '{Count:1b,id:"solsweetpotato:food_book"}', -5 : '{Count:2b,id:"simpleshops:simple_shop"}', +5 : '{Count:2b,id:"toms_trading_network:vending_machine"}', 6 : '{Count:1b,id:"thermal:satchel",tag:{ItemInv:{ItemInv:[{Count:20b,Slot:0b,id:"thermal:bronze_coin"}]},RepairCost:0,display:{Name:'{"text":"Wallet"}'}}}', 7 : '{Count:1b,ForgeCaps:{Parent:{Items:[{Count:4b,Slot:0,id:"minecraft:cooked_mutton"},{Count:6b,Slot:1,id:"minecraft:bread"},{Count:8b,Slot:2,id:"minecraft:apple"},{Count:2b,Slot:3,id:"minecraft:cookie"}],Size:5}},id:"solsweetpotato:lunchbag"}', 8 : '{Count:16b,id:"minecraft:torch"}', diff --git a/index.toml b/index.toml index 08a4be7..518a4bc 100644 --- a/index.toml +++ b/index.toml @@ -20,10 +20,6 @@ hash = "418f8824835fa1e3490b26fcf43cb16d8bfb653a17a2a61b0854a7c18a0f5546" file = "config/canary.properties" hash = "e048897ad0aa8aedeff3073b0246082b4b502e29115555ab773402e97efc8c28" -[[files]] -file = "config/carryon-common.toml" -hash = "fc58bc1b3690259bda273aa79cf96d45a1d01cb3b19b71eb168472ba6243de50" - [[files]] file = "config/enhancedvisuals-client.json" hash = "ad170bba4bca8888f6484cda3153e1a9cdc9c5be81f2ca98c902962d1d606f96" @@ -42,7 +38,7 @@ hash = "4d1b1fb5cb5441c0579e67c0159a14a0ec0c393db1e378ec81efdb946e964c0a" [[files]] file = "config/fancymenu/customization/um-mainmenu.txt" -hash = "b10b59fd35628862c330bfd8f0340b98114d75b6d95f8b354c6772cf43311f0c" +hash = "e01cd1cff1c5b5d9cf69fb0351dd09c162e227bd8d1e115093ef5ee323561c69" [[files]] file = "config/fancymenu/customization/um-multiplayer-menu.txt" @@ -66,7 +62,7 @@ hash = "f4f94b6b9dcbbf19a828c842217306169bcff7f9570b81af612b5404bc4bda87" [[files]] file = "config/starterkit/starterkit.txt" -hash = "076347ab8b98ea4440f649563e48f204e7f6f886b7ecc9814576b2fae3a70092" +hash = "c3d57b88f8d5217f33736ffc10736137b90bee6f9597835097deef4cbd8355e1" [[files]] file = "config/toastcontrol-common.toml" @@ -233,6 +229,11 @@ file = "mods/cc-tweaked.pw.toml" hash = "9a0923ead8905649bc1260301508dc349ec7dd134fd8278a67e144d1f3ed68df" metafile = true +[[files]] +file = "mods/chunky.pw.toml" +hash = "d42a44515e657e67431cb042727db14f697b6d80c88c1da5fbe4c8afce738d29" +metafile = true + [[files]] file = "mods/clumps.pw.toml" hash = "5880c81df1af395ec3762eff4e98c78f7b75e62db67e1d191a1772d79aabc073" @@ -330,7 +331,7 @@ metafile = true [[files]] file = "mods/createaddition.pw.toml" -hash = "c00b90f4ba88e8b77ccf1b35608f5380b0e182a2c77f0e7e1a8d2f13d4cb5665" +hash = "5b9a6cc1eb37dea317debe134e5ee19a41d8c5822e003979fe866298657807c4" metafile = true [[files]] @@ -440,7 +441,7 @@ metafile = true [[files]] file = "mods/fastworkbench.pw.toml" -hash = "5db298a5768d41bc516ac521d95588ff074e5af6bd17567628d10f319ebd85ae" +hash = "ab09ecf0f07ee64186802e309c196c27337ff092eac196fa5f9c80b5a287badf" metafile = true [[files]] @@ -990,7 +991,7 @@ metafile = true [[files]] file = "mods/seasonhud.pw.toml" -hash = "f5f389dfb743543035a4fd4412658371fde9d08948d22275ddde48ee8f016dbb" +hash = "17ac105d0f3f2471fea085359d362e022d948307e497ad77d348f46e0b1c0b0b" metafile = true [[files]] @@ -1018,11 +1019,6 @@ file = "mods/shetiphiancore.pw.toml" hash = "e9c24e17fc72c175a7bb24a930769037f9f3e82f4e79ad34fe67ca7770419674" metafile = true -[[files]] -file = "mods/simple-shops.pw.toml" -hash = "d7baf988341b7460d51b96cb123ce03408cb04a008e522eabbf6c6029325ad62" -metafile = true - [[files]] file = "mods/smooth-boot-reloaded.pw.toml" hash = "49a62dc782f18f414f4dd5fd08a10a31c8698a87404ed12b7a847b6ac474c2e4" @@ -1153,6 +1149,11 @@ file = "mods/toast-control.pw.toml" hash = "8ff48d18f2fbe8df674dcd79aabcece27808667c270401b06ac10c97d7552990" metafile = true +[[files]] +file = "mods/toms-trading-network.pw.toml" +hash = "ceef32f674e015396093dea572c11cdbbf6d0d6d31721a9f2c58ba9ef77732d5" +metafile = true + [[files]] file = "mods/torchmaster.pw.toml" hash = "eb445d9519a2a81b60706da33663b2fc8201de6d486d98489a0f97fa1b0b00a9" diff --git a/mods/chunky.pw.toml b/mods/chunky.pw.toml new file mode 100644 index 0000000..4a56b08 --- /dev/null +++ b/mods/chunky.pw.toml @@ -0,0 +1,13 @@ +name = "Chunky" +filename = "Chunky-1.3.38.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/fALzjamp/versions/WNen5Iom/Chunky-1.3.38.jar" +hash-format = "sha1" +hash = "d347c38b359f39d6fdd6dcaa4b5baf54a30d7428" + +[update] +[update.modrinth] +mod-id = "fALzjamp" +version = "WNen5Iom" diff --git a/mods/createaddition.pw.toml b/mods/createaddition.pw.toml index a74c1b1..69b43db 100644 --- a/mods/createaddition.pw.toml +++ b/mods/createaddition.pw.toml @@ -1,13 +1,13 @@ name = "Create Crafts & Additions" -filename = "createaddition-1.19.2-20230411a.jar" +filename = "createaddition-1.19.2-20230426a.jar" side = "both" [download] hash-format = "sha1" -hash = "928b19d475b5694918f72f10387d8e8b4c40ece8" +hash = "1f307306cef8ad2c54bfcebc4d266e8c4ce741de" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4486261 +file-id = 4508466 project-id = 439890 diff --git a/mods/fastworkbench.pw.toml b/mods/fastworkbench.pw.toml index b6f86a5..f7aac1d 100644 --- a/mods/fastworkbench.pw.toml +++ b/mods/fastworkbench.pw.toml @@ -1,13 +1,13 @@ name = "FastWorkbench" -filename = "FastWorkbench-1.19.2-7.1.1.jar" +filename = "FastWorkbench-1.19.2-7.1.2.jar" side = "both" [download] hash-format = "sha1" -hash = "2669ca8d9c8bff239fd1857c89f7b6dff54cd1dc" +hash = "3ab2e95727806a714fd0b015f27d3050ef091e50" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4498885 +file-id = 4508990 project-id = 288885 diff --git a/mods/seasonhud.pw.toml b/mods/seasonhud.pw.toml index cd2f403..486a29a 100644 --- a/mods/seasonhud.pw.toml +++ b/mods/seasonhud.pw.toml @@ -1,13 +1,13 @@ name = "SeasonHUD" -filename = "seasonhud-1.19.2-1.4.12.jar" +filename = "seasonhud-1.19.2-1.4.13.jar" side = "both" [download] hash-format = "sha1" -hash = "91d7aef918db421aaa872e5ffb18ce4106b5c940" +hash = "3b56d3d87fb706d0a55a8fa6e9bf4c571896af41" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4502920 +file-id = 4508782 project-id = 690971 diff --git a/mods/simple-shops.pw.toml b/mods/simple-shops.pw.toml deleted file mode 100644 index 017f88b..0000000 --- a/mods/simple-shops.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Simple Shops" -filename = "simpleshops-1.2.2.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "668b89645eba0151f4ac789a45f47e0c981e69a4" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4409377 -project-id = 517272 diff --git a/mods/toms-trading-network.pw.toml b/mods/toms-trading-network.pw.toml new file mode 100644 index 0000000..df759f9 --- /dev/null +++ b/mods/toms-trading-network.pw.toml @@ -0,0 +1,13 @@ +name = "Tom's Trading Network" +filename = "toms_trading_network-1.19-0.1.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/x5iQ3NM5/versions/D474LYev/toms_trading_network-1.19-0.1.0.jar" +hash-format = "sha1" +hash = "630e8903fe3d04391af9d07a0ee9e330bd915b3b" + +[update] +[update.modrinth] +mod-id = "x5iQ3NM5" +version = "D474LYev" diff --git a/pack.toml b/pack.toml index 01f54c7..bbbff6a 100644 --- a/pack.toml +++ b/pack.toml @@ -1,12 +1,12 @@ name = "ScrumptiousCraft Um" author = "razage" -version = "1.0.19" +version = "1.0.20" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "65a6ce7d318d431a6a8da673a74cce14c387f8bbee4a51b97e7671688df0f277" +hash = "3f84251ae86d1b02df7cf76ae33fadabf4f00421885669fc3a94cb681cd7755a" [versions] forge = "43.2.8"