diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ca1155..ec34b41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ -- added Kibe -- added Building Wands -- removed Universal Graves from client -- added some emotes -- updated Architectury -- fixed client crashes (hopefully) +- added MoStructures +- added custom window title and icon +- changed tempad recipes +- fixed austri3Fix emote (the irony lol) +- fixed recipes +- fixed some tags +- updated options.txt +- waystones in foreign claims are now usable diff --git a/mods.txt b/mods.txt index 9cbbc66..5daa0e4 100644 --- a/mods.txt +++ b/mods.txt @@ -115,3 +115,4 @@ https://cdn.modrinth.com/data/sGmHWmeL/versions/1.1.1+1.17/mixintrace-1.1.1%2B1. https://cdn.modrinth.com/data/OvlwmUdC/versions/1.9.8-BETA+1.18/kibe-1.9.8-BETA%2B1.18.jar https://mediafiles.forgecdn.net/files/3875/410/BuildingWands_mc1.18.2-2.6_beta-fabric.jar https://cdn.tilera.xyz/minecraft/mods/palettefix/palettefix-1.0.0.jar +https://cdn.modrinth.com/data/PTGd6dWp/versions/1.4.2+1.18.2/mostructures-1.4.2%2B1.18.2.jar diff --git a/overrides/config/aofemotes.json b/overrides/config/aofemotes.json index 370ddd6..81aef5d 100644 --- a/overrides/config/aofemotes.json +++ b/overrides/config/aofemotes.json @@ -19,6 +19,6 @@ "tilera": "kubejs:emotes/tilera.png", "waaas": "kubejs:emotes/waaas.png", "leder": "kubejs:emotes/leder.png", - "austri3Fix": "kubejs:emotes/austri3Fix.png" + "austri3Fix": "kubejs:emotes/austri3fix.png" } -} \ No newline at end of file +} diff --git a/overrides/kubejs/assets/kubejs/emotes/austri3Fix.png b/overrides/kubejs/assets/kubejs/emotes/austri3fix.png similarity index 100% rename from overrides/kubejs/assets/kubejs/emotes/austri3Fix.png rename to overrides/kubejs/assets/kubejs/emotes/austri3fix.png diff --git a/overrides/kubejs/config/client.properties b/overrides/kubejs/config/client.properties new file mode 100644 index 0000000..aeae3db --- /dev/null +++ b/overrides/kubejs/config/client.properties @@ -0,0 +1 @@ +title=Anvilcraft 4 diff --git a/overrides/kubejs/config/packicon.png b/overrides/kubejs/config/packicon.png new file mode 100644 index 0000000..03bb477 Binary files /dev/null and b/overrides/kubejs/config/packicon.png differ diff --git a/overrides/kubejs/server_scripts/30-tags.js b/overrides/kubejs/server_scripts/30-tags.js new file mode 100644 index 0000000..a7bf92d --- /dev/null +++ b/overrides/kubejs/server_scripts/30-tags.js @@ -0,0 +1,31 @@ +/// IDs of all waystones. +const waystones = [ + "waystones:waystone", + "waystones:desert_waystone", + "waystones:red_desert_waystone", + "waystones:stone_brick_waystone", + "waystones:nether_brick_waystone", + "waystones:red_nether_brick_waystone", + "waystones:end_stone_brick_waystone", + "waystones:deepslate_brick_waystone", + "waystones:blackstone_brick_waystone", +]; + +function blockTags(ev) { + // this allows players to activate other people's waystones + ev.add("ftbchunks:interact_whitelist", waystones); +} + +function addNuggetTags(ev, material, item) { + ev.add(`c:${material}_nuggets`, item); + ev.add(`c:nuggets/${material}`, item); +} + +function itemTags(ev) { + // ConsistencyPlus actually doesn't know how tags work + addNuggetTags(ev, "copper", "consistency_plus:copper_nugget"); + addNuggetTags(ev, "netherite", "consistency_plus:netherite_nugget"); +} + +onEvent("tags.blocks", blockTags); +onEvent("tags.items", itemTags); diff --git a/overrides/kubejs/server_scripts/40-recipes.js b/overrides/kubejs/server_scripts/40-recipes.js index 9531744..d17bb01 100644 --- a/overrides/kubejs/server_scripts/40-recipes.js +++ b/overrides/kubejs/server_scripts/40-recipes.js @@ -4,35 +4,53 @@ function recipes(ev) { // conflicts with copper nuggets ev.remove({output: "redstonebits:copper_button"}); + // this recipe makes alectrum out of copper. wtf. + ev.remove({ + type: "create:mixing", + output: "techreborn:electrum_ingot", + }); + + ev.custom({ + type: "create:mixing", + ingredients: [ + Ingredient.of("#c:silver_ingots").toJson(), + Ingredient.of("#c:gold_ingots").toJson(), + ], + results: [ + Item.of("techreborn:electrum_ingot", 2).toResultJson(), + ], + heatRequirement: "heated", + }); + ev.shaped("redstonebits:copper_button", [ "CC", - "CC" + "CC", ], { - C: "#c:copper_ingots" + C: "#c:copper_ingots", }); ev.shaped("tempad:tempad", [ "GGG", "PCD", - "GGG" + "GGG", ], { G: "#c:gold_ingots", - P: "modern_industrialization:processing_unit", + P: "techreborn:data_storage_chip", C: "powah:ender_core", - D: "techreborn:digital_display" + D: "techreborn:digital_display", }); ev.shaped("tempad:he_who_remains_tempad", [ - "UTD", + "ITF", "NSN", - "DRU" + "FRI", ], { - U: "dimdoors:unravelled_block", N: "#c:netherite_ingots", - D: "minecraft:deepslate", T: "tempad:tempad", R: "blockus:legacy_nether_reactor_core", - S: "minecraft:nether_star" + S: "minecraft:nether_star", + I: "dimdoors:infrangible_fiber", + F: "dimdoors:frayed_filament", }); } diff --git a/overrides/options.txt b/overrides/options.txt index 179c82e..5f138f8 100644 --- a/overrides/options.txt +++ b/overrides/options.txt @@ -11,16 +11,16 @@ discrete_mouse_scroll:false invertYMouse:false realmsNotifications:true reducedDebugInfo:false -showSubtitles:false +showSubtitles:true touchscreen:false -fullscreen:false +fullscreen:true bobView:true toggleCrouch:false toggleSprint:false darkMojangStudiosBackground:false hideLightningFlashes:false mouseSensitivity:0.5 -fov:0.0 +fov:0.5 screenEffectScale:1.0 fovEffectScale:1.0 gamma:1.0 @@ -29,15 +29,15 @@ simulationDistance:12 entityDistanceScaling:1.0 guiScale:2 particles:0 -maxFps:120 +maxFps:260 difficulty:2 graphicsMode:2 ao:2 prioritizeChunkUpdates:0 biomeBlendRadius:2 renderClouds:true -resourcePacks:["Fabric Mods","Theinar Language"] -incompatibleResourcePacks:[] +resourcePacks:["vanilla","Fabric Mods","Theinar Language","continuity/default","continuity/glass_pane_culling_fix","computercraft/overhaul"] +incompatibleResourcePacks:["computercraft/overhaul","file/Unity-Modded","file/Unity-Extras"] lastServer: lang:en_us soundDevice: @@ -47,7 +47,7 @@ chatLineSpacing:0.0 textBackgroundOpacity:0.5 backgroundForChatOnly:true hideServerAddress:false -advancedItemTooltips:false +advancedItemTooltips:true pauseOnLostFocus:true overrideWidth:0 overrideHeight:0 @@ -62,14 +62,14 @@ useNativeTransport:true mainHand:right attackIndicator:1 narrator:0 -tutorialStep:movement +tutorialStep:none mouseWheelSensitivity:1.0 rawMouseInput:true glDebugVerbosity:1 -skipMultiplayerWarning:false +skipMultiplayerWarning:true skipRealms32bitWarning:false hideMatchedNames:true -joinedFirstServer:false +joinedFirstServer:true hideBundleTutorial:false syncChunkWrites:false showAutosaveIndicator:true @@ -108,6 +108,10 @@ key_key.hotbar.6:key.keyboard.6 key_key.hotbar.7:key.keyboard.7 key_key.hotbar.8:key.keyboard.8 key_key.hotbar.9:key.keyboard.9 +key_key.ellemes_container_lib.config:key.keyboard.g +key_key.ftbchunks.map:key.keyboard.m +key_key.ftbchunks.minimap.zoomIn:key.keyboard.equal +key_key.ftbchunks.minimap.zoomOut:key.keyboard.minus key_key.iron-jetpacks.engine:key.keyboard.v key_key.iron-jetpacks.hover:key.keyboard.g key_key.iron-jetpacks.descend:key.keyboard.unknown @@ -118,24 +122,55 @@ key_key.ae2.wireless_pattern_encoding_terminal:key.keyboard.unknown key_key.ae2.wireless_pattern_access_terminal:key.keyboard.unknown key_key.ae2.ae2wtlib_restock:key.keyboard.unknown key_key.ae2.ae2wtlib_magnet:key.keyboard.unknown +key_key.agape_space.vehicle_menu:key.keyboard.b +key_key.ftbultimine:key.keyboard.r +key_key.bewitchment.transformation_ability:key.keyboard.unknown key_key.botania_corporea_request:key.keyboard.c key_create.keyinfo.toolmenu:key.keyboard.left.alt key_create.keyinfo.toolbelt:key.keyboard.left.alt +key_key.dankstorage.construction:key.keyboard.i +key_key.dankstorage.lock_slot:key.keyboard.unknown +key_key.dankstorage.pickup_mode:key.keyboard.o key_key.dml-refabricated.teleport:key.keyboard.v key_key.dml-refabricated.soul_vision:key.keyboard.b key_key.indrev.modular:key.keyboard.k key_key.indrev.gamer_axe_toggle:key.keyboard.g key_mininggadgets.text.open_gui:key.keyboard.unknown key_key.modern_industrialization.activate:key.keyboard.v +key_key.mousewheelie.open_config_screen:key.keyboard.unknown +key_key.mousewheelie.sort_inventory:key.mouse.middle +key_key.mousewheelie.scroll_up:key.amecsapi.mouse.scroll.up +key_key.mousewheelie.scroll_down:key.amecsapi.mouse.scroll.down +key_key.mousewheelie.pick_tool:key.keyboard.unknown key_key.mtmechs.primary:key.keyboard.v -key_key.mtr.lift_menu:key.keyboard.z +key_key.small_artifacts.ender_sack:key.keyboard.x +key_key.travelersbackpack.inventory:key.keyboard.b +key_key.travelersbackpack.toggle_tank:key.keyboard.n +key_key.travelersbackpack.cycle_tool:key.keyboard.z +key_key.wands.wand_mode:key.keyboard.v +key_key.wands.wand_action:key.keyboard.h +key_key.wands.wand_menu:key.keyboard.y +key_key.wands.wand_orientation:key.keyboard.x +key_key.wands.wand_invert:key.keyboard.i +key_key.wands.wand_fill_circle:key.keyboard.k +key_key.wands.wand_undo:key.keyboard.u +key_key.wands.palette_menu:key.keyboard.j +key_key.wands.wand_palette_mode:key.keyboard.r +key_key.wands.wand_conf:key.keyboard.unknown +key_key.wands.m_inc:key.keyboard.right +key_key.wands.m_dec:key.keyboard.left +key_key.wands.n_inc:key.keyboard.up +key_key.wands.n_dec:key.keyboard.down +key_key.wands.toggle_stair_slab:key.keyboard.period +key_key.wands.area_diagonal_spread:key.keyboard.comma +key_key.wands.inc_sel_block:key.keyboard.z key_key.waila.config:key.keyboard.keypad.0 key_key.waila.show_overlay:key.keyboard.keypad.1 key_key.waila.toggle_liquid:key.keyboard.keypad.2 key_key.waila.show_recipe_input:key.keyboard.keypad.3 key_key.waila.show_recipe_output:key.keyboard.keypad.4 -key_key.wthit-plugins.show_author:key.keyboard.left.shift -soundCategory_master:1.0 +key_key.wthit-plugins.show_author:key.keyboard.unknown +soundCategory_master:0.38245034 soundCategory_music:0.0 soundCategory_record:1.0 soundCategory_weather:1.0