From af1c6af3e8338f774dfe98f5f75c2b89a2a3266b Mon Sep 17 00:00:00 2001 From: ZHAY10086 Date: Mon, 17 Nov 2025 15:35:44 +0800 Subject: [PATCH] update to hotfix2 --- config/InvTweaks.cfg | 2 +- config/ItemFavorites/jacc.dat | 1 + config/betterquesting.cfg | 3 ++ config/jei/worldSettings.cfg | 34 ++++++++++++------- config/spellarchives-client.cfg | 17 ++++++---- config/spellarchives.cfg | 14 ++++++++ config/splash.properties | 4 +-- scripts/ModularAether.zs | 2 +- scripts/ModularVoidBranches.zs | 4 +-- scripts/Nudes.zs | 7 ++++ .../AstralRelayHaloClient.zs | 4 +-- .../AstralRelayRenderFixClient.zs | 3 +- ...rver.txt => AstralRelayRenderFixServer.zs} | 2 +- .../SigilTableJEITransferClient.zs | 2 +- scripts/mixin/AllowQueenImprinting.zs | 24 +++++++++++++ .../LastStandrework/LastStandFormula.txt | 20 ----------- .../mixin/LastStandrework/LastStandFormula.zs | 16 +++++++++ .../mixin/iceandfireweapons/tidetrident.txt | 17 ---------- .../mixin/iceandfireweapons/tidetrident.zs | 14 ++++++++ 19 files changed, 123 insertions(+), 67 deletions(-) create mode 100644 config/ItemFavorites/jacc.dat create mode 100644 config/spellarchives.cfg rename scripts/mixin/AedialClientVSServer/{AstralRelayRenderFixServer.txt => AstralRelayRenderFixServer.zs} (99%) delete mode 100644 scripts/mixin/LastStandrework/LastStandFormula.txt create mode 100644 scripts/mixin/LastStandrework/LastStandFormula.zs delete mode 100644 scripts/mixin/iceandfireweapons/tidetrident.txt create mode 100644 scripts/mixin/iceandfireweapons/tidetrident.zs diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg index 45c6d2a4..fac82775 100644 --- a/config/InvTweaks.cfg +++ b/config/InvTweaks.cfg @@ -1,6 +1,6 @@ #Inventory Tweaks Configuration #(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html) -#Wed Oct 08 14:21:36 CDT 2025 +#Sun Nov 16 21:34:33 CST 2025 enableMiddleClick=true showChestButtons=true enableSortingOnPickup=false diff --git a/config/ItemFavorites/jacc.dat b/config/ItemFavorites/jacc.dat new file mode 100644 index 00000000..e0e6278f --- /dev/null +++ b/config/ItemFavorites/jacc.dat @@ -0,0 +1 @@ +["false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false"] \ No newline at end of file diff --git a/config/betterquesting.cfg b/config/betterquesting.cfg index 0e320ae0..7fa721a0 100644 --- a/config/betterquesting.cfg +++ b/config/betterquesting.cfg @@ -24,6 +24,8 @@ general { # Increases or decreases the scrolling speed [range: 0.0 ~ 10.0, default: 1.0] S:"Scroll Speed Multiplier"=1.0 + + # If true, skip the home GUI and open quests at startup. This property will be changed by the mod itself. [default: false] B:"Skip Home"=false # If true, then the player will spawn with a Quest Book when they first join the world [default: true] @@ -51,3 +53,4 @@ general { S:"Zoom Speed"=1.25 } + diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index 927ade01..c7c819e7 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -403,18 +403,15 @@ world-288993849 { world-310143583 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=false - - # Give items instead of showing the recipe. - B:cheatItemsEnabled=true + B:cheatItemsEnabled=false # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText=integrat contr + S:filterText=lens rai # Show the list of ingredients next to open GUIs. B:overlayEnabled=true @@ -591,18 +588,11 @@ world-754345806 { world-754956732 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=true B:cheatItemsEnabled=true - - # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= - - # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false S:filterText=@packaged - - # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } @@ -1233,6 +1223,25 @@ world3253 { } +world3254231 { + # Show the list of bookmarks next to open GUIs. + B:bookmarkOverlayEnabled=true + + # Give items instead of showing the recipe. + B:cheatItemsEnabled=false + + # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) + S:defaultFluidContainerItem= + + # Hide and unhide ingredients by clicking them in the list. + B:editEnabled=false + S:filterText= + + # Show the list of ingredients next to open GUIs. + B:overlayEnabled=true +} + + world338062577 { B:bookmarkOverlayEnabled=true B:cheatItemsEnabled=true @@ -1630,3 +1639,4 @@ world97320 { B:overlayEnabled=true } + diff --git a/config/spellarchives-client.cfg b/config/spellarchives-client.cfg index 1b580561..8370b1a5 100644 --- a/config/spellarchives-client.cfg +++ b/config/spellarchives-client.cfg @@ -19,7 +19,7 @@ gui { # Secondary/detail text color in the right panel (hex). Accepts 0xAARRGGBB or #RRGGBB/#AARRGGBB. Example: 0xFFAAAAAA S:DETAIL_TEXT=0xFFAAAAAA - # Embed the element icon directly into the spine texture instead of drawing it as an overlay. + # Embed the element icon into the book spine. B:SPINE_EMBED_ICON=true # Enable thin decorative horizontal bands on spines. @@ -73,10 +73,10 @@ gui { # Additional vertical offset for the navigation buttons row relative to grid end (pixels; negative moves up). I:ARROWS_Y_OFFSET=6 - # Strength of subtle inner/outer shadow applied to themed panels (0 - 100%). [percent: 0..100] + # Strength of subtle inner/outer shadow applied to themed panels (0 - 100%). D:OUTER_SHADOW_STRENGTH=40.0 - # Strength of the vertical gradient applied to themed panel backgrounds (0 - 100%). [percent: 0..100] + # Strength of the vertical gradient applied to themed panel backgrounds (0 - 100%). D:PANEL_GRADIENT=60.0 # Right panel border color (hex). Accepts 0xAARRGGBB or #RRGGBB/#AARRGGBB. Example: 0xFF111111 @@ -91,15 +91,18 @@ gui { # Minimum width of the right details panel (pixels). I:RIGHT_PANEL_MIN_WIDTH=120 - # Fraction of the window width dedicated to the right details panel (0 - 100%). [percent: 0..100] + # Fraction of the window width dedicated to the right details panel (0 - 100%). D:RIGHT_PANEL_RATIO=38.0 # Vertical gap in pixels between rows of spines. I:ROW_GAP=3 - # Amount to darken the world behind the GUI (0% = no darkening, 100% = fully black). Range: 0 - 100% [percent: 0..100] + # config.spellarchives.screen_darken_desc D:SCREEN_DARKEN_FACTOR=55.0 + # Maximum visual size in pixels of the identification scroll reserve slot in the bottom bar. + I:SCROLL_SLOT_MAX_SIZE=20 + # Gap in pixels between the two decorative bands on the spine. I:SPINE_BAND_GAP=1 @@ -109,13 +112,13 @@ gui { # Space in pixels from the top of the available spine area to the first band. I:SPINE_BAND_TOP_SPACE=1 - # Fraction of screen height used by the archive window (0 - 100%). [percent: 0..100] + # Fraction of screen height used by the archive window (0 - 100%). D:HEIGHT_RATIO=75.0 # Outer margin around the archive window (pixels). I:MARGIN=10 - # Fraction of screen width used by the archive window (0 - 100%). [percent: 0..100] + # Fraction of screen width used by the archive window (0 - 100%). D:WIDTH_RATIO=50.0 } diff --git a/config/spellarchives.cfg b/config/spellarchives.cfg new file mode 100644 index 00000000..53d11df2 --- /dev/null +++ b/config/spellarchives.cfg @@ -0,0 +1,14 @@ +# Configuration file + +gameplay { + # Enable auto-pickup + B:auto_pickup_enabled=true + + # Enable identification scroll reserve + B:scroll_reserve_enabled=true + + # Scroll reserve capacity + I:scroll_reserve_max=2048 +} + + diff --git a/config/splash.properties b/config/splash.properties index 06418a34..67c752fe 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Wed Oct 08 14:08:52 CDT 2025 +#Sun Nov 16 21:28:15 CST 2025 background=0xBFBFBF memoryGood=0x00091A font=0x960826 @@ -14,4 +14,4 @@ bar=0x00091A resourcePackPath=resources logoOffset=0 forgeTexture=fml\:textures/gui/forge.png -fontTexture=textures/font/ascii.png \ No newline at end of file +fontTexture=textures/font/ascii.png diff --git a/scripts/ModularAether.zs b/scripts/ModularAether.zs index 9fd949d5..7aa0dae7 100644 --- a/scripts/ModularAether.zs +++ b/scripts/ModularAether.zs @@ -82,7 +82,7 @@ enc8.addItemOutput(SuperEnchantedItem(.withTag({displ enc8.build(); val enc9 = RecipeBuilder.newBuilder("astaeth9","gravitite_enchanter",40); -enc9.addFluidInput(*50); +enc9.addFluidInput(*60); enc9.addItemInput(); enc9.addItemOutput(); enc9.build(); diff --git a/scripts/ModularVoidBranches.zs b/scripts/ModularVoidBranches.zs index e1b2f8a2..45eb9779 100644 --- a/scripts/ModularVoidBranches.zs +++ b/scripts/ModularVoidBranches.zs @@ -641,8 +641,8 @@ rainbowlensgrav.addItemOutput(); rainbowlensgrav.build(); -val rainbowlensgrav2 = RecipeBuilder.newBuilder("rainbowlensgrav2","gravitite_enchanter",5); -rainbowlensgrav2.addFluidInput(*5); +val rainbowlensgrav2 = RecipeBuilder.newBuilder("rainbowlensgrav2","gravitite_enchanter",40); +rainbowlensgrav2.addFluidInput(*200); rainbowlensgrav2.addItemInput(*4); rainbowlensgrav2.addItemInput(); rainbowlensgrav2.addItemInput(); diff --git a/scripts/Nudes.zs b/scripts/Nudes.zs index 837cea01..d8e5854c 100644 --- a/scripts/Nudes.zs +++ b/scripts/Nudes.zs @@ -42,6 +42,13 @@ recipes.addShaped(, [, , ], [, .withTag({species: "rootBees", chromosome: 0, allele: "forestry.speciesDemonic"}), ]]); + +recipes.addShaped(*4, +[[, .withTag({species: "rootBees", chromosome: 0, allele: "forestry.speciesDemonic"}), ], +[, , ], +[, .withTag({species: "rootBees", chromosome: 0, allele: "forestry.speciesDemonic"}), ]]); + + val oreDemonStoneOreDict = ; oreDemonStoneOreDict.add(); diff --git a/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs b/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs index a1c84c02..f88d9087 100644 --- a/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs +++ b/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs @@ -1,6 +1,6 @@ #modloaded astralsorcery #loader mixin -#clientonly +#sideonly client import native.hellfirepvp.astralsorcery.client.ClientScheduler; import native.net.minecraft.client.renderer.BufferBuilder; @@ -140,4 +140,4 @@ zenClass AstralRelayHalo_RenderTranslucentItem { GlStateManager.enableTexture2D(); GlStateManager.popMatrix(); } -} +} \ No newline at end of file diff --git a/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs index d6598a0d..e3a125fa 100644 --- a/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs +++ b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs @@ -1,5 +1,6 @@ #modloaded astralsorcery #loader mixin +#sideonly client import native.hellfirepvp.astralsorcery.common.tile.TileAttunementRelay; @@ -56,4 +57,4 @@ zenClass MixinTESRAttunementRelay_RenderFix { // Fully replace original method body ci.cancel(); } -} +} \ No newline at end of file diff --git a/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.zs similarity index 99% rename from scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt rename to scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.zs index 29c28017..04114852 100644 --- a/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt +++ b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.zs @@ -46,4 +46,4 @@ zenClass MixinBlockAttunementRelay_OnActivateGuard { if (!current.isEmpty() && ItemStack.areItemsEqual(current, held) && ItemStack.areItemStackTagsEqual(current, held)) cir.setReturnValue(true); } -} +} \ No newline at end of file diff --git a/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs b/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs index 52d2fbd4..a5786e5f 100644 --- a/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs +++ b/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs @@ -1,6 +1,6 @@ #modloaded bewitchment #loader mixin -#clientonly +#sideonly client import native.mezz.jei.api.IModRegistry; import native.mezz.jei.api.recipe.transfer.IRecipeTransferRegistry; diff --git a/scripts/mixin/AllowQueenImprinting.zs b/scripts/mixin/AllowQueenImprinting.zs index 74261d28..db9e3cb0 100644 --- a/scripts/mixin/AllowQueenImprinting.zs +++ b/scripts/mixin/AllowQueenImprinting.zs @@ -2,16 +2,21 @@ #loader mixin import native.net.minecraft.item.ItemStack; +import native.net.minecraft.nbt.NBTTagCompound; import native.forestry.api.genetics.AlleleManager; +import native.forestry.api.apiculture.BeeManager; +import native.forestry.api.apiculture.EnumBeeType; import native.net.bdew.gendustry.machines.imprinter.TileImprinter; import native.net.bdew.gendustry.items.GeneTemplate; +import mixin.CallbackInfo; import mixin.CallbackInfoReturnable; // Allow putting a Queen into the Genetic Imprinter, instead of only Princess or Drone #mixin {targets: "net.bdew.gendustry.machines.imprinter.TileImprinter"} zenClass AllowQueenImprinting { + // Overrides the slot validation, to allow queens to be inserted into the imprinter // SRG HEAD: TileEntity#isItemValidForSlot -> func_94041_b) #mixin Inject #{ @@ -31,4 +36,23 @@ zenClass AllowQueenImprinting { cir.setReturnValue(true); } } + + // The imprinter only overwrites 1 genome, but queens need both genomes set. + #mixin Inject + #{ + # method: "doStart", + # at: { value: "HEAD" }, + # cancellable: true + #} + function ensureBothGenomes(bee as ItemStack, ci as CallbackInfo) as void { + val self as TileImprinter = this as TileImprinter; + + val individual = AlleleManager.alleleRegistry.getIndividual(bee); + + // getType(ItemStack) fails because of ZS, so we use isMated and isDrone as Queen detection + if (individual != null && BeeManager.beeRoot.isMated(bee) && !BeeManager.beeRoot.isDrone(bee)) { + val tag as NBTTagCompound = bee.getTagCompound(); + tag.setTag("Mate", tag.getCompoundTag("Genome")); + } + } } \ No newline at end of file diff --git a/scripts/mixin/LastStandrework/LastStandFormula.txt b/scripts/mixin/LastStandrework/LastStandFormula.txt deleted file mode 100644 index 7fd2eb47..00000000 --- a/scripts/mixin/LastStandrework/LastStandFormula.txt +++ /dev/null @@ -1,20 +0,0 @@ -#loader mixin - -import mixin.CallbackInfo; -import native.openblocks.enchantments.LastStandEnchantmentsHandler; - - -#mixin Mixin -#{targets: "openblocks.enchantments.LastStandEnchantmentsHandler"} -zenClass MixinLastStandEnchantmentsHandler { - #mixin ModifyConstant - #{ - # method: "lambda$onLivingHurt$0", - # constant: {intValue: 50} - #} - function changelaststandflatmultiplier(value as int) as int { - return 400; - } -} - - diff --git a/scripts/mixin/LastStandrework/LastStandFormula.zs b/scripts/mixin/LastStandrework/LastStandFormula.zs new file mode 100644 index 00000000..7fd56671 --- /dev/null +++ b/scripts/mixin/LastStandrework/LastStandFormula.zs @@ -0,0 +1,16 @@ +#modloaded openblocks +#loader mixin + +#mixin {value: "openblocks.enchantments.LastStandEnchantmentsHandler"} +zenClass MixinLastStandEnchantmentsHandler { + #mixin Static + #mixin ModifyConstant + #{ + # method: "lambda$onHurt$1", + # constant: {floatValue: 50.0} + #} + function mbc_modify_xpRequiredFlat(original as float) as float { + return 400.0f; + } +} + diff --git a/scripts/mixin/iceandfireweapons/tidetrident.txt b/scripts/mixin/iceandfireweapons/tidetrident.txt deleted file mode 100644 index 3fe723b7..00000000 --- a/scripts/mixin/iceandfireweapons/tidetrident.txt +++ /dev/null @@ -1,17 +0,0 @@ -#loader mixin - -import mixin.CallbackInfo; -import native.com.github.alexthe666.iceandfire.entity.EntityTideTrident; - -#mixin Mixin -#{targets: "com.github.alexthe666.iceandfire.entity.EntityTideTrident"} -zenClass MixinEntityTideTrident { - #mixin ModifyConstant - #{ - # method: "EntityTideTrident", - # constant: {doubleValue: 6.0D} - #} - function ChangeTideTridentdamage(existing as double) as double { - return 35.0 as double; - } -} diff --git a/scripts/mixin/iceandfireweapons/tidetrident.zs b/scripts/mixin/iceandfireweapons/tidetrident.zs new file mode 100644 index 00000000..ce7a00ae --- /dev/null +++ b/scripts/mixin/iceandfireweapons/tidetrident.zs @@ -0,0 +1,14 @@ +#modloaded iceandfire +#loader mixin + +#mixin {value: "com.github.alexthe666.iceandfire.entity.EntityTideTrident"} +zenClass MixinEntityTideTrident { + #mixin ModifyConstant + #{ + # method: "", + # constant: {doubleValue: 6.0D} + #} + function mbc_modify_dmg_TideTrident(original as double) as double { + return 35.0d; + } +} \ No newline at end of file