From 21dbb774366da44d514abb0c25bf67aaad691675 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Tue, 16 May 2023 21:09:04 +0200 Subject: [PATCH 01/17] Add no-mob-farms for stopping raid farms --- index.toml | 5 +++++ mods/no-mob-farms.pw.toml | 13 +++++++++++++ pack.toml | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mods/no-mob-farms.pw.toml diff --git a/index.toml b/index.toml index c675f3a..394a8d4 100644 --- a/index.toml +++ b/index.toml @@ -670,6 +670,11 @@ file = "mods/no-chat-reports.pw.toml" hash = "1aa7510ec1a3994273a20f8b341f676583b9ede2eaea3badd46deb7178d92a6c" metafile = true +[[files]] +file = "mods/no-mob-farms.pw.toml" +hash = "582b3d7d0248fa413c18939f3aeb283000b0af08bfb23c28a1fe73a793a92d11" +metafile = true + [[files]] file = "mods/no-shield-delay.pw.toml" hash = "11d7d7dac686582ef0fd37ff3fb19334c3c39625c2f7d8050e5133b492136453" diff --git a/mods/no-mob-farms.pw.toml b/mods/no-mob-farms.pw.toml new file mode 100644 index 0000000..c0f25ad --- /dev/null +++ b/mods/no-mob-farms.pw.toml @@ -0,0 +1,13 @@ +name = "No Mob Farms" +filename = "nomobfarm-1.6.3.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "e1fab8f8ab0bcf97f834fab7d46e6b86cd85f445" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3824757 +project-id = 560784 diff --git a/pack.toml b/pack.toml index c356a0c..c31e782 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 = "4047f0a5af51576407ca01d84536ba00dadd0ea64b28cdbd3ed5b6754161ccba" +hash = "358de98beb6896d08382c48f60a219a09105b47495f85630245c7c7b1cf53892" [versions] minecraft = "1.19.2" From ecc0008f8b807ba8be124b5ae40b072c36307a54 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 15:34:49 +0200 Subject: [PATCH 02/17] Push pack version --- pack.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.toml b/pack.toml index c31e782..5910c22 100644 --- a/pack.toml +++ b/pack.toml @@ -1,6 +1,6 @@ name = "ExploreCraft: Marbled" author = "Sangelo" -version = "2.0_Pre-Release" +version = "2.0_RC" pack-format = "packwiz:1.1.0" [index] @@ -10,4 +10,4 @@ hash = "358de98beb6896d08382c48f60a219a09105b47495f85630245c7c7b1cf53892" [versions] minecraft = "1.19.2" -quilt = "0.18.9" +quilt = "0.18.10" From 1a89bc4ceaa38d710be2a50457d9f6dbe26aaf88 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 16:12:25 +0200 Subject: [PATCH 03/17] No Mob Farm configuration progress --- config/nomobfarm.properties | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 config/nomobfarm.properties diff --git a/config/nomobfarm.properties b/config/nomobfarm.properties new file mode 100644 index 0000000..2ffd97d --- /dev/null +++ b/config/nomobfarm.properties @@ -0,0 +1,46 @@ +# No Mob Farm (mob farm debuffs) config + +bamboo_drop_requires_player=false +gourd_drop_requires_player=false +farmer_instant_pickup=true +piston_moves_gourd=false +cactus_drop_requires_player=false +sugar_cane_drop_requires_player=false + + +# Natural Mob Spawning (default: 100000) +natural_max_wait=50000 +# Natural Mob Spawning (options) +natural_offline_persistence=259200 +natural_recovery_rate=3.0E-4 +natural_max_deaths=-1 +natural_min_deaths=0 +natural_slowdown_rate=1000 + + +# Spawner debuffs (default: 10000, turned off) +spawner_max_wait=0 +# Spawner debuffs (options) +spawner_slowdown_near_rate=20 +spawner_recovery_rate=0.001 +spawner_max_deaths=-1 +spawner_offline_persistence=259200 +spawner_slowdown_far_rate=100 +spawner_slowdown_rate=20 +spawner_min_deaths=15 + +# Zombie reinforcement penalties +reinforcement_penalty_conversion=false # default: true +reinforcement_penalty=0 # default: 0.049 + +# Iron Farms +golem_detection_memory=0 # default: 10000 + +# Raid Farms +raid_center_min_randomization=16 + +raid_min_size=512 + +raid_center_max_randomization=24 + +raid_no_bad_omen_loop=true From 4aa2e4b16155c7f02355bfd32db5f9067c324f0e Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 18:53:35 +0200 Subject: [PATCH 04/17] Cleanup --- config/roughlyenoughitems/config.json5 | 174 ------------------ config/roughlyenoughitems/hints.json | 1 - config/roughlyenoughitems/pinyin.properties | 2 - .../pinyin_double.properties | 3 - 4 files changed, 180 deletions(-) delete mode 100644 config/roughlyenoughitems/config.json5 delete mode 100644 config/roughlyenoughitems/hints.json delete mode 100644 config/roughlyenoughitems/pinyin.properties delete mode 100644 config/roughlyenoughitems/pinyin_double.properties diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 deleted file mode 100644 index c89ed3a..0000000 --- a/config/roughlyenoughitems/config.json5 +++ /dev/null @@ -1,174 +0,0 @@ -{ - "basics": { - "favorites": [ - "{data:{Count:1b,id:\"minecraft:waxed_weathered_cut_copper_slab\",type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}", - "{data:{Count:1b,id:\"minecraft:waxed_exposed_cut_copper_slab\",type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}", - "{data:{Count:1b,id:\"mythicmetals:banglum_chestplate\",tag:{Damage:0},type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}", - "{data:{Count:1b,id:\"mythicmetals:steel_pickaxe\",tag:{Damage:0},type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}" - ], - "hiddenFavorites": [], - "displayHistory": [], - // Declares whether cheating mode is on. - "cheating": true, - "favoritesEnabled": true, - "keyBindings": { - "recipeKeybind": { - "keyCode": "key.keyboard.r", - "modifier": 2 - }, - "usageKeybind": { - "keyCode": "key.keyboard.u", - "modifier": 2 - }, - "hideKeybind": { - "keyCode": "key.keyboard.o", - "modifier": 2 - }, - "previousPageKeybind": { - "keyCode": "key.keyboard.unknown", - "modifier": 0 - }, - "nextPageKeybind": { - "keyCode": "key.keyboard.unknown", - "modifier": 0 - }, - "focusSearchFieldKeybind": { - "keyCode": "key.keyboard.unknown", - "modifier": 0 - }, - "copyRecipeIdentifierKeybind": { - "keyCode": "key.mouse.middle", - "modifier": 0 - }, - "favoriteKeybind": { - "keyCode": "key.keyboard.a", - "modifier": 2 - }, - "exportImageKeybind": { - "keyCode": "key.keyboard.f8", - "modifier": 0 - }, - "previousScreenKeybind": { - "keyCode": "key.keyboard.backspace", - "modifier": 0 - } - }, - // Declares whether REI is visible. - "overlayVisible": true, - "cheatingStyle": "GRAB", - "motion": { - "favoritesAnimation": true - } - }, - "advanced": { - "filtering": { - "shouldFilterDisplays": true, - "filteringRules": [ - "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" - ], - "filteringQuickCraftCategories": { }, - "filteredStacks": [] - }, - "enableJeiCompatibilityLayer": true, - "tooltips": { - // Declares whether REI should append mod names to entries. - "appendModNames": true, - // Declares whether favorites tooltip should be displayed. - "displayFavoritesTooltip": false, - "displayIMEHints": true - }, - "layout": { - // The ordering of the items on the entry panel. - "entryPanelOrdering": "REGISTRY_ASCENDING", - // Declares the maximum amount of recipes displayed in a page if possible. - "maxRecipesPerPage": 8, - // Declares the maximum amount of recipes displayed in a page if possible. - "maxRecipesPageHeight": 300, - // Declares whether entry rendering time should be debugged. - "debugRenderTimeRequired": false, - // Merges displays with equal contents under 1 display. - "mergeDisplayUnderOne": true, - "favoriteAddWidgetMode": "ALWAYS_VISIBLE" - }, - "accessibility": { - "entrySize": 1.0, - // Declares the position of the entry panel. - "displayPanelLocation": "RIGHT", - // Declares how the scrollbar in composite screen should act. - "compositeScrollBarPermanent": false, - "toastDisplayedOnCopyIdentifier": true, - // Declares whether REI should use compact tabs for categories. - "useCompactTabs": true, - // Declares whether REI should use compact tab buttons for categories. - "useCompactTabButtons": false - }, - "search": { - // Declares whether search time should be debugged. - "debugSearchTimeRequired": false, - // Declares whether REI should search async. - "asyncSearch": true, - // Declares how many entries should be grouped one async search. - "asyncSearchPartitionSize": 100, - "patchAsyncThreadCrash": true, - "tooltipSearch": "ALWAYS", - "tagSearch": "PREFIX", - "identifierSearch": "ALWAYS", - "modSearch": "PREFIX" - }, - "commands": { - // Declares the command used to change gamemode. - "gamemodeCommand": "/gamemode {gamemode}", - // Declares the command used in servers to cheat items. - "giveCommand": "/give {player_name} {item_identifier}{nbt} {count}", - // Declares the command used to change weather. - "weatherCommand": "/weather {weather}", - // Declares the command used to change time. - "timeCommand": "/time set {time}" - }, - "miscellaneous": { - // Declares whether arrows in containers should be clickable. - "clickableRecipeArrows": true, - "registerRecipesInAnotherThread": true, - "newFastEntryRendering": true, - "cachingFastEntryRendering": false - } - }, - "appearance": { - "recipeScreenType": "ORIGINAL", - // Declares the appearance of REI windows. - "theme": "LIGHT", - "layout": { - // Declares the position of the search field. - "searchFieldLocation": "CENTER", - // Declares the position of the config button. - "configButtonLocation": "LOWER", - // Declares whether the craftable filter button is enabled. - "showCraftableOnlyButton": true - }, - // Declares the appearance of recipe's border. - "recipeBorder": "DEFAULT", - // Declares whether entry panel is scrolled. - "scrollingEntryListWidget": false, - "horizontalEntriesBoundaries": 1.0, - "verticalEntriesBoundaries": 1.0, - "horizontalEntriesBoundariesColumns": 50, - "verticalEntriesBoundariesRows": 1000, - "favoritesHorizontalEntriesBoundaries": 1.0, - "favoritesHorizontalEntriesBoundariesColumns": 50, - "syntaxHighlightingMode": "COLORFUL", - "isFocusModeZoomed": false - }, - "functionality": { - "inputMethod": null, - // Declares whether REI should remove the recipe book. - "disableRecipeBook": false, - // Declares whether mob effects should be on the left side instead of the right side. - "leftSideMobEffects": false, - // Declares whether subsets is enabled. - "isSubsetsEnabled": false, - "allowInventoryHighlighting": true, - "itemCheatingMode": "REI_LIKE" - } -} \ No newline at end of file diff --git a/config/roughlyenoughitems/hints.json b/config/roughlyenoughitems/hints.json deleted file mode 100644 index b5676b0..0000000 --- a/config/roughlyenoughitems/hints.json +++ /dev/null @@ -1 +0,0 @@ -{"UUID":"a8fbc08378784efaa1888eead5bb8093","shownHints":[]} \ No newline at end of file diff --git a/config/roughlyenoughitems/pinyin.properties b/config/roughlyenoughitems/pinyin.properties deleted file mode 100644 index f16e56d..0000000 --- a/config/roughlyenoughitems/pinyin.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Pinyin Options -#Sun Jan 29 16:48:35 CET 2023 diff --git a/config/roughlyenoughitems/pinyin_double.properties b/config/roughlyenoughitems/pinyin_double.properties deleted file mode 100644 index ec97acf..0000000 --- a/config/roughlyenoughitems/pinyin_double.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Double Pinyin Options -#Sun Jan 29 16:48:35 CET 2023 -Converter=sougou From bdbf9671e0e6056034899f42f8bf783e15eca983 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 18:53:58 +0200 Subject: [PATCH 05/17] Freeze Iris version (disable notification) --- config/iris.properties | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 config/iris.properties diff --git a/config/iris.properties b/config/iris.properties new file mode 100644 index 0000000..64b4549 --- /dev/null +++ b/config/iris.properties @@ -0,0 +1,7 @@ +#This file stores configuration options for Iris, such as the currently active shaderpack +#Tue May 16 20:51:21 CEST 2023 +disableUpdateMessage=true +enableDebugOptions=false +maxShadowRenderDistance=16 +shaderPack= +enableShaders=false From 0fcdf095044690ff6514a8e57968072c22d443b4 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 18:54:45 +0200 Subject: [PATCH 06/17] Update Chunks Fade In & Xaero's Maps --- mods/chunks-fade-in.pw.toml | 18 +++++++++--------- mods/xaeros-minimap.pw.toml | 6 +++--- mods/xaeros-world-map.pw.toml | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mods/chunks-fade-in.pw.toml b/mods/chunks-fade-in.pw.toml index d2f66d1..383e4cc 100644 --- a/mods/chunks-fade-in.pw.toml +++ b/mods/chunks-fade-in.pw.toml @@ -1,18 +1,18 @@ name = "Chunks fade in" -filename = "chunksfadein-v3.0.9-1.19.jar" +filename = "chunksfadein-v3.0.11-1.19.jar" side = "client" -[option] -optional = true -default = true -description = "Fade-in animation for newly loaded chunks." - [download] -url = "https://cdn.modrinth.com/data/JaNmzvA8/versions/NRcn8zRv/chunksfadein-v3.0.9-1.19.jar" +url = "https://cdn.modrinth.com/data/JaNmzvA8/versions/EvgXpevG/chunksfadein-v3.0.11-1.19.jar" hash-format = "sha1" -hash = "a5938adc09fe2fed8ca85564805bf200c5b9ae3d" +hash = "1a33853f958de0c9b8901af3ab3af18b3979fd75" [update] [update.modrinth] mod-id = "JaNmzvA8" -version = "NRcn8zRv" +version = "EvgXpevG" + +[option] +optional = true +description = "Fade-in animation for newly loaded chunks." +default = true diff --git a/mods/xaeros-minimap.pw.toml b/mods/xaeros-minimap.pw.toml index d561389..03728f4 100644 --- a/mods/xaeros-minimap.pw.toml +++ b/mods/xaeros-minimap.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's Minimap" -filename = "Xaeros_Minimap_23.3.3_Fabric_1.19.1.jar" +filename = "Xaeros_Minimap_23.4.3_Fabric_1.19.1.jar" side = "both" [download] hash-format = "sha1" -hash = "0427baf7e4cb8a8542d4d7beea832c8022659272" +hash = "3e67aedaf349699ea256004b654a30035977b961" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4470056 +file-id = 4538265 project-id = 263420 diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml index f983dbe..facd663 100644 --- a/mods/xaeros-world-map.pw.toml +++ b/mods/xaeros-world-map.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's World Map" -filename = "XaerosWorldMap_1.29.5_Fabric_1.19.1.jar" +filename = "XaerosWorldMap_1.30.2_Fabric_1.19.1.jar" side = "both" [download] hash-format = "sha1" -hash = "f5e659df4bb8276cce0ba40afd672895940a7900" +hash = "0e182f24e9fdc0e0bea4fb6a743a1f67412a9bef" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4470076 +file-id = 4536624 project-id = 317780 From 885e9042aab87282801951ff7b632fe0689149c4 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 18:54:56 +0200 Subject: [PATCH 07/17] Update Credits Link --- config/isxander-main-menu-credits.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/isxander-main-menu-credits.json b/config/isxander-main-menu-credits.json index e688f08..10ca2f4 100644 --- a/config/isxander-main-menu-credits.json +++ b/config/isxander-main-menu-credits.json @@ -8,7 +8,7 @@ "text":"ExploreCraft: Marbled by Sangelo", "clickEvent": { "action": "open_url", - "value": "https://github.com/ExploreCraft/modpack" + "value": "https://gitpot.dev/ExploreCraft/modpack" } } ], From c3a2d168e2088946940c6e1df5ddd5182902ceec Mon Sep 17 00:00:00 2001 From: Sangelo Date: Wed, 17 May 2023 18:55:03 +0200 Subject: [PATCH 08/17] Refresh Packwiz --- index.toml | 32 ++++++++++++-------------------- pack.toml | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/index.toml b/index.toml index 394a8d4..a8020b1 100644 --- a/index.toml +++ b/index.toml @@ -52,9 +52,13 @@ hash = "b80ddaabfcd550d12b5d22e45febbd5b442e4df60b6803747d1f673478b2a6d6" file = "config/global_data_and_resourcepacks.toml" hash = "71d2c6cc31654e6d31b143b16a8c8d77aa6b32ca17f8816c5013e2a91100ee44" +[[files]] +file = "config/iris.properties" +hash = "fb5e6ab72a95e17f63b06b2c9f7b9f76d05300ac5ca87504c16c3d12d8b49f1a" + [[files]] file = "config/isxander-main-menu-credits.json" -hash = "1c5a09efdb61f50dd2c2ac2a93f4073969d58944e20538d90db67b87f4d43c38" +hash = "03c2818b51664ebce210b4ff061cba17f13b64afec4c0fec8052eb1d0dbea2ca" [[files]] file = "config/legendarytooltips-common.toml" @@ -68,26 +72,14 @@ hash = "f9e41263213b3231dd67cdb3e516a73931c3ae8b80282a6eae174237cfb39343" file = "config/mythicmetals.json5" hash = "172fbcaebcaa40c0d5e5afc11253fd40b67c2987ed65a1f678c44be4260a68d3" +[[files]] +file = "config/nomobfarm.properties" +hash = "7554c232edf2006d9f44ce542ce104d76bc143888e231f524fdadb77b3694445" + [[files]] file = "config/puzzle.json" hash = "7dddd9b8df252ed38ad83a27d0d49145c1697abdf1d7ddb1a24ae6cf7683f6df" -[[files]] -file = "config/roughlyenoughitems/config.json5" -hash = "95a4f07391ba7e8c2489540d8f074e8663805d876ffd966e3c13db05d0bc3166" - -[[files]] -file = "config/roughlyenoughitems/hints.json" -hash = "9ae130f157296720a9c05d97768fdff5a9ff31d71abc3231068a91934e87ad13" - -[[files]] -file = "config/roughlyenoughitems/pinyin.properties" -hash = "0f1fe94968d7eb66226ac6542ae9d074ae6b556bb6b2f032408db3c51de05439" - -[[files]] -file = "config/roughlyenoughitems/pinyin_double.properties" -hash = "0c6290df8508998c8ac4e66d3d82d2bccf41c81ee6fa4bfbf806a96484d0cf6b" - [[files]] file = "config/sodium-options.json" hash = "3b01094400618f74596b9a3d0a5b60082e67bbb75174b592cd1393905584a8a7" @@ -267,7 +259,7 @@ metafile = true [[files]] file = "mods/chunks-fade-in.pw.toml" -hash = "48bbb6b7ecc1c90132e5c9e07bb125ffe17b09dd2b3e9edb58fa1d032ac1484f" +hash = "3cb8d03458fca7955cbe0155c78a89ade6fded1f59490c6cb970fbb9ab0bcbaf" metafile = true [[files]] @@ -902,12 +894,12 @@ metafile = true [[files]] file = "mods/xaeros-minimap.pw.toml" -hash = "a3375fd142e06deedd28c50d9dfc5ba8294121eac84b9c98d5a12a2475649aea" +hash = "d20aae5fd2bcc4abc1ce6e45e3ef63fbfd09f57844fc23f68d5869779bb7b54d" metafile = true [[files]] file = "mods/xaeros-world-map.pw.toml" -hash = "c071fa54273dc9f6358fb0b740e4893e617ffbe779c14909c27ad928bd246411" +hash = "de820e3dd2a2b21e80d382c18883758c0844a18c83d45fdb90b24af2eeb5bbe8" metafile = true [[files]] diff --git a/pack.toml b/pack.toml index 5910c22..bdd44e5 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 = "358de98beb6896d08382c48f60a219a09105b47495f85630245c7c7b1cf53892" +hash = "af217fea6c74be31816b285b8a52cead95885818ce09008480e4a285095eac48" [versions] minecraft = "1.19.2" From c5f7e4afc2b889c126873b8e5565c4a181e179e4 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 11:17:38 +0200 Subject: [PATCH 09/17] NoMobFarm continue config --- config/nomobfarm.properties | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/nomobfarm.properties b/config/nomobfarm.properties index 2ffd97d..fe9a2cc 100644 --- a/config/nomobfarm.properties +++ b/config/nomobfarm.properties @@ -1,8 +1,9 @@ # No Mob Farm (mob farm debuffs) config +# Possible to be modified bamboo_drop_requires_player=false gourd_drop_requires_player=false -farmer_instant_pickup=true +farmer_instant_pickup=false piston_moves_gourd=false cactus_drop_requires_player=false sugar_cane_drop_requires_player=false @@ -37,10 +38,7 @@ reinforcement_penalty=0 # default: 0.049 golem_detection_memory=0 # default: 10000 # Raid Farms -raid_center_min_randomization=16 - +raid_center_min_randomization=24 +raid_center_max_randomization=32 raid_min_size=512 - -raid_center_max_randomization=24 - raid_no_bad_omen_loop=true From 625dbac2fbf3512848fb31ca6ea82d7bfd3f9dd3 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 11:40:38 +0200 Subject: [PATCH 10/17] Modify Shield recipe --- config/yigd.toml | 163 ------------------ .../data/minecraft/recipes/shield.json | 19 ++ 2 files changed, 19 insertions(+), 163 deletions(-) delete mode 100644 config/yigd.toml create mode 100644 resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/shield.json diff --git a/config/yigd.toml b/config/yigd.toml deleted file mode 100644 index 5125e50..0000000 --- a/config/yigd.toml +++ /dev/null @@ -1,163 +0,0 @@ -[graveSettings] -generateGraves = true -retrievalType = "ON_USE" -compactRetrieveItems = true -retrievalRequireShovel = false -dropType = "IN_INVENTORY" -dropPlayerHead = false -dropGraveBlock = false -requireGraveItem = false -generateEmptyGraves = false -ignoreSpawnProtection = true -deathInSpawnProtection = "CREATE_GRAVE" -priority = "GRAVE" -unlockableGraves = true -deleteEnchantments = ["minecraft:vanishing_curse", "vanishing_curse"] -soulboundEnchantments = ["yigd:soulbound"] -loseSoulboundLevelOnDeath = false -voidSlots = [] -soulboundSlots = [] -applyBindingCurse = true -useLastGroundPos = false -trySoft = false -trySoftApproach = "RADIUS" -tryStrict = true -replaceWhenClaimed = true -persistGraves = false -blacklistDimensions = [] -graveInVoid = true -ignoreDeathTypes = [] -graveSpawnHeight = 2 -lastResort = "DROP_ITEMS" -putXpInGrave = true -defaultXpDrop = false -xpDropPercent = 50 -tellDeathPos = true -maxGraveBackups = 50 - -[graveSettings.graveRobbing] -enableRobbing = true -onlyMurderer = false -afterTime = 1 -timeType = "HOURS" -robPriority = "INVENTORY" -tellRobber = true -notifyWhenRobbed = true - -[graveSettings.graveDeletion] -canDelete = false -afterTime = 1 -timeType = "HOURS" -dropInventory = false - -[graveSettings.itemLoss] -enableLoss = false -ignoreSoulboundItems = true -affectStacks = false -usePercentRange = false -lossRangeFrom = 0 -lossRangeTo = 5 -percentChanceOfLoss = 100 - -[graveSettings.randomSpawnSettings] -percentSpawnChance = 0 -spawnEntity = "minecraft:zombie" -spawnNbt = "{ArmorItems:[{},{},{},{id:\"minecraft:player_head\",tag:{SkullOwner:{Name:\"${name}\",Id:\"${uuid}\"}},Count:1b}]}" - -[graveSettings.blockUnderGrave] -generateBlockUnder = true -inOverWorld = "minecraft:cobblestone" -inNether = "minecraft:soul_soil" -inTheEnd = "minecraft:end_stone" -inCustom = "minecraft:dirt" -generateWhenProtected = false - -[graveSettings.graveCompatConfig] -levelzXpInGraves = true -levelzXpDropPercent = 100 -claimRuleOverride = "CREATE_GRAVE" -prioritiseTheGraveyardGraves = false -graveyardSearchRadius = 10 -keepAllTrinkets = false - -[graveSettings.graveRenderSettings] -useRenderFeatures = true -useSpecialBlockRenderer = true -renderGraveSkull = true -renderGraveOwner = true -textShadow = true -adaptRenderer = false -glowingGrave = true -glowMinDistance = 0 -glowMaxDistance = 10 - -[graveSettings.graveRenderSettings.guiTextColors] -graveSelectGraveLocation = 13369548 -graveSelectItemSize = 204 -graveSelectLevelSize = 2725384 -graveSelectTitle = 5592405 -graveSelectPageView = 30464 -graveSelectShowAvailableCheckbox = 7829367 -graveSelectShowClaimedCheckbox = 7829367 -graveSelectShowDestroyedCheckbox = 7829367 -graveSelectShowStatusCheckbox = 7829367 -graveViewLockGrave = 0 -graveViewUnlockGrave = 0 -graveViewRestoreGrave = 0 -graveViewDeleteGrave = 0 -graveViewRobGrave = 0 -graveViewGiveKey = 0 -graveViewDeathMessage = 11141120 -graveViewDeathDimension = 21956 -graveViewCoordinates = 12255419 -graveViewModItemSize = 5592405 -graveViewLevelSize = 2725384 -claimedBy = 0 -playerSelectPlayerName = 16384 -playerSelectGraveCount = 5592405 -playerSelectTitle = 5592405 -playerSelectPageView = 30464 -playerSelectIncludeAvailableCheckbox = 7829367 -playerSelectIncludeClaimedCheckbox = 7829367 -playerSelectIncludeDestroyedCheckbox = 7829367 -playerSelectShowZeroCheckbox = 7829367 -playerSelectSearchBar = 16777215 -[utilitySettings.soulboundEnchant] -enabled = true -isTreasure = false -villagerTrade = true -tableAndLoot = false -[utilitySettings.deathSightEnchant] -enabled = false -isTreasure = true -villagerTrade = true -tableAndLoot = true -[utilitySettings.scrollItem] -scrollType = "DISABLED" -retrieveOnRespawn = true -[utilitySettings.graveKeySettings] -enableKeys = false -alwaysRequire = false -retrieveOnRespawn = true -getFromGui = false -rebindable = false -graveKeySpecification = "PLAYER" -[utilitySettings.graveCompassSettings] -receiveOnDeath = false -tryDeleteOnClaim = true -[commandToggles] -coreCommandName = "yigd" -retrieveGrave = true -robGrave = true -selfView = true -adminView = true -moderateGraves = true -clearGraveBackups = true -whitelist = true -whitelistAdd = true -whitelistRemove = true -whitelistToggle = true -coordinateToggle = true -[debugConfig] -clearInventoryOnRespawn = false -createGraveBeforeDeathMessage = false diff --git a/resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/shield.json b/resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/shield.json new file mode 100644 index 0000000..37915b6 --- /dev/null +++ b/resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/shield.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "W": { + "tag": "minecraft:logs" + }, + "S": { + "item": "mythicmetals:silver_ingot" + } + }, + "pattern": [ + "SWS", + "SWS", + " W " + ], + "result": { + "item": "minecraft:shield" + } +} \ No newline at end of file From 6854acd6d8e561f8264013d007e263aa6e8732c2 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 11:43:28 +0200 Subject: [PATCH 11/17] refresh packwiz --- index.toml | 10 +++++----- pack.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.toml b/index.toml index a8020b1..4044d66 100644 --- a/index.toml +++ b/index.toml @@ -74,7 +74,7 @@ hash = "172fbcaebcaa40c0d5e5afc11253fd40b67c2987ed65a1f678c44be4260a68d3" [[files]] file = "config/nomobfarm.properties" -hash = "7554c232edf2006d9f44ce542ce104d76bc143888e231f524fdadb77b3694445" +hash = "8ce0c65915976baead7d76f6e8d7e5a84c68475961d6fc54925ce435c69ce056" [[files]] file = "config/puzzle.json" @@ -88,10 +88,6 @@ hash = "3b01094400618f74596b9a3d0a5b60082e67bbb75174b592cd1393905584a8a7" file = "config/tokenablefurnaces.json" hash = "a33d04b053faccfc7029ac16e14a3ee1e07ee2da18b7fc678e44a9b06c615f12" -[[files]] -file = "config/yigd.toml" -hash = "3fe32487221f8aa35e6f31647078a3484c3da586b76c20ee96dfef4d21d45dc3" - [[files]] file = "mods/3dskinlayers.pw.toml" hash = "be1ff1b29f0935a35259b5b7fc3ec104149c83b2f5f783c9751f5759d0dc75fa" @@ -1067,6 +1063,10 @@ hash = "f3d26b4fff8c9b018c7cf5959014ff1cfbda6904eabd031ff9ce8deb36535a2a" file = "resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/oak_wood.json" hash = "ee2d22f68915997cbf6cf851ecaeb5207349871f5a1433790b41c149ae420533" +[[files]] +file = "resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/shield.json" +hash = "d224ffade2ca157abd03ff4fd6bedbc1904afb3d61476b43024376ed2b65f319" + [[files]] file = "resources/required-data/ExploreCraft-Tweaks/data/minecraft/recipes/spruce_wood.json" hash = "faa3eb9e9601669fdfda47bf3da9a4c67d7dba8210a5a1b9991631b419cb44a3" diff --git a/pack.toml b/pack.toml index bdd44e5..9954875 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 = "af217fea6c74be31816b285b8a52cead95885818ce09008480e4a285095eac48" +hash = "d732f4cef9fe82889c9097f6ee50604699cd135eecbb3de7efda73f0f9495da0" [versions] minecraft = "1.19.2" From 9f318fb89228e95ba4b17aab0e5277a63e505935 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 11:46:44 +0200 Subject: [PATCH 12/17] Fix nomobfarm config comments --- config/nomobfarm.properties | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/nomobfarm.properties b/config/nomobfarm.properties index fe9a2cc..763320c 100644 --- a/config/nomobfarm.properties +++ b/config/nomobfarm.properties @@ -31,11 +31,14 @@ spawner_slowdown_rate=20 spawner_min_deaths=15 # Zombie reinforcement penalties -reinforcement_penalty_conversion=false # default: true -reinforcement_penalty=0 # default: 0.049 +reinforcement_penalty_conversion=false +# default: true +reinforcement_penalty=0 +# default: 0.049 # Iron Farms -golem_detection_memory=0 # default: 10000 +golem_detection_memory=0 +# default: 10000 # Raid Farms raid_center_min_randomization=24 From d8b457bc7e5bebfec8cbede9d1dd6226160eee3e Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 11:47:44 +0200 Subject: [PATCH 13/17] refresh packwiz --- index.toml | 2 +- pack.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.toml b/index.toml index 4044d66..6d5a92a 100644 --- a/index.toml +++ b/index.toml @@ -74,7 +74,7 @@ hash = "172fbcaebcaa40c0d5e5afc11253fd40b67c2987ed65a1f678c44be4260a68d3" [[files]] file = "config/nomobfarm.properties" -hash = "8ce0c65915976baead7d76f6e8d7e5a84c68475961d6fc54925ce435c69ce056" +hash = "a18e19970d598fc8009b49f02e4fc24aaca445e96f5f7bdd1b4084918e2c1350" [[files]] file = "config/puzzle.json" diff --git a/pack.toml b/pack.toml index 9954875..5275005 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 = "d732f4cef9fe82889c9097f6ee50604699cd135eecbb3de7efda73f0f9495da0" +hash = "e7309e035778c77e0137456bfd1415f628dbb9be883ef4a9b89b07f352357e50" [versions] minecraft = "1.19.2" From bdf77c18cd93f6ca03900ec3111e26fada812550 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 12:08:25 +0200 Subject: [PATCH 14/17] Add bclib/config/recipes.json & update bclib --- index.toml | 6 +++++- mods/bclib.pw.toml | 8 ++++---- pack.toml | 2 +- .../ExploreCraft-Tweaks/bclib/config/recipes.json | 6 ++++++ 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json diff --git a/index.toml b/index.toml index 6d5a92a..bfa7798 100644 --- a/index.toml +++ b/index.toml @@ -185,7 +185,7 @@ metafile = true [[files]] file = "mods/bclib.pw.toml" -hash = "bd21befb0fa945159638844e06cba6a5e298785866508a95a100026a10dac0a8" +hash = "ab6dc95a659eae917ed5afa8ce4c4540be91d3e77290902b37eb6a08f0537f5f" metafile = true [[files]] @@ -1003,6 +1003,10 @@ hash = "870ebf2bb126f86410f1d27a45b2c4cafed48811eef532634ee1740b4569b1c1" file = "resources/required-assets/ExploreCraft-Tweaks/pack.png" hash = "9f4f45f48072314f152c642caf157f787181e025e228e3ebe38715e65676210a" +[[files]] +file = "resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json" +hash = "e316898e097d38286284a976940644f7a39ada677834e055ca3cc82abb56846f" + [[files]] file = "resources/required-data/ExploreCraft-Tweaks/data/craftable_bundles_leather/advancements/recipes/bundle_leather.json" hash = "0200f33c84d5a6c6ae3306156724abe3e63d38079c02e630c45b3b19dfbdc179" diff --git a/mods/bclib.pw.toml b/mods/bclib.pw.toml index 51e4b15..5d4b831 100644 --- a/mods/bclib.pw.toml +++ b/mods/bclib.pw.toml @@ -1,13 +1,13 @@ name = "BCLib" -filename = "bclib-2.1.5.jar" +filename = "bclib-2.1.6.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/BgNRHReB/versions/kyFQ8QVW/bclib-2.1.5.jar" +url = "https://cdn.modrinth.com/data/BgNRHReB/versions/mKksn4EY/bclib-2.1.6.jar" hash-format = "sha1" -hash = "37306b6c44f90c2472e2f939599d8d2be9c61a59" +hash = "464d38d3e2b0b098855e1faa583a002ed2269257" [update] [update.modrinth] mod-id = "BgNRHReB" -version = "kyFQ8QVW" +version = "mKksn4EY" diff --git a/pack.toml b/pack.toml index 5275005..ad9ba4f 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 = "e7309e035778c77e0137456bfd1415f628dbb9be883ef4a9b89b07f352357e50" +hash = "b4fed2b716715a1c72392ec20b92cb47110f7046c3cfdbb66297c4c1072af295" [versions] minecraft = "1.19.2" diff --git a/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json b/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json new file mode 100644 index 0000000..9fc35a4 --- /dev/null +++ b/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json @@ -0,0 +1,6 @@ +{ + "disable": [ + "betternether:shield", + "bclib:tag_shield" + ] +} From 314dea7ee5a34cec32f737ae83668d077b2bf12a Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 12:15:48 +0200 Subject: [PATCH 15/17] Fix shield disable recipe --- config/bclib/recipes.json | 4 ++-- .../ExploreCraft-Tweaks/bclib/config/recipes.json | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json diff --git a/config/bclib/recipes.json b/config/bclib/recipes.json index 4cd592d..c4b216b 100644 --- a/config/bclib/recipes.json +++ b/config/bclib/recipes.json @@ -244,7 +244,7 @@ "stalagnate_bowl_apple [default: true]": true, "stick [default: true]": true, "sugar [default: true]": true, - "shield [default: true]": true, + "shield [default: true]": false, "piston [default: true]": true, "stalagnate_bowl [default: true]": true, "agave_medicine [default: true]": true, @@ -306,7 +306,7 @@ "tag_compass [default: true]": true, "tag_bucket [default: true]": true, "tag_minecart [default: true]": true, - "tag_shield [default: true]": true, + "tag_shield [default: true]": false, "tag_shulker_box [default: true]": true }, "furnace": { diff --git a/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json b/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json deleted file mode 100644 index 9fc35a4..0000000 --- a/resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "disable": [ - "betternether:shield", - "bclib:tag_shield" - ] -} From e96715aef9cf6709a28901d43c88c9af98c86399 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 18 May 2023 12:19:25 +0200 Subject: [PATCH 16/17] Refresh Packwiz --- index.toml | 6 +----- pack.toml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/index.toml b/index.toml index bfa7798..7a400e8 100644 --- a/index.toml +++ b/index.toml @@ -26,7 +26,7 @@ hash = "6c374c2361f59dbbace6322200613773ec01d5fb6e8fb70ac5d89463e3631f05" [[files]] file = "config/bclib/recipes.json" -hash = "3448a40718ccbfde6d8f260daa2f93e66ac9b32617274cc4a10b963b66d32b22" +hash = "4c24025d4253cffe2c23d9325994abf056c7bbb589375ce74fbd44a2ccf0975f" [[files]] file = "config/bclib/server.json" @@ -1003,10 +1003,6 @@ hash = "870ebf2bb126f86410f1d27a45b2c4cafed48811eef532634ee1740b4569b1c1" file = "resources/required-assets/ExploreCraft-Tweaks/pack.png" hash = "9f4f45f48072314f152c642caf157f787181e025e228e3ebe38715e65676210a" -[[files]] -file = "resources/required-data/ExploreCraft-Tweaks/bclib/config/recipes.json" -hash = "e316898e097d38286284a976940644f7a39ada677834e055ca3cc82abb56846f" - [[files]] file = "resources/required-data/ExploreCraft-Tweaks/data/craftable_bundles_leather/advancements/recipes/bundle_leather.json" hash = "0200f33c84d5a6c6ae3306156724abe3e63d38079c02e630c45b3b19dfbdc179" diff --git a/pack.toml b/pack.toml index ad9ba4f..510d81a 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 = "b4fed2b716715a1c72392ec20b92cb47110f7046c3cfdbb66297c4c1072af295" +hash = "e2b3cac94eec781f24f6599873657c1124075b104ef536f3ea6ba05b0017f6e8" [versions] minecraft = "1.19.2" From 76f69b6409b24f5da6254bacfd63670f79dddbe4 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Sun, 21 May 2023 15:13:08 +0200 Subject: [PATCH 17/17] Push pack version, release! --- pack.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.toml b/pack.toml index 510d81a..eebbfe1 100644 --- a/pack.toml +++ b/pack.toml @@ -1,6 +1,6 @@ name = "ExploreCraft: Marbled" author = "Sangelo" -version = "2.0_RC" +version = "2.0.1" pack-format = "packwiz:1.1.0" [index]