From bee95f9065cf3cfd7cef676dbd7a30d3cb0b5b98 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 17 Aug 2025 17:55:28 +0200 Subject: [PATCH] scrungus --- changelog | 7 +++++-- .../recipes/loader/SerializableRecipe.java | 2 +- .../com/hbm/itempool/ItemPoolsComponent.java | 12 ++++++++---- .../weapon/sedna/factory/XFactory12ga.java | 4 ++-- .../hbm/textures/models/trinkets/hundun.png | Bin 1336 -> 3240 bytes 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/changelog b/changelog index a06979124..c910a8ca3 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,13 @@ ## Changed * QMAW now has buttons for returning to previously viewed pages -* QMAW file detection now includes subfolders to `manual` +* QMAW file detection now includes subfolders to `manual` in folder-based packs (which already worked in zip packs and the mod's jar file) * OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units * The sodium and strontium autogen ingots now have their correct hazard tags * Pattern matchers, like the one used on the automatic crafting table, no longer care about NBT data of an item * This means that RBMK fuel rods can now be automatically disassembled without the depletion number having to be a 100% match * Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets +* Blueprint folders have been added to more loot pools, making them less rare +* Replaced the winnie the pooh plushie with hundun ## Fixed * Fixed QMAW not working at all @@ -14,4 +16,5 @@ * Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors * Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot * Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes -* Fixed balefire bomb not rendering the egg when fully loaded \ No newline at end of file +* Fixed balefire bomb not rendering the egg when fully loaded +* Fixed selenium steel 12ga casings having the wrong color \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java index 80567014d..2770da7c7 100644 --- a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java @@ -123,7 +123,7 @@ public abstract class SerializableRecipe { Reader reader = new InputStreamReader(stream); recipe.readRecipeStream(reader); recipe.modified = true; - } catch(IOException ex) { + } catch(Throwable ex) { MainRegistry.logger.error("Failed to reset synced recipe stream", ex); } } else if(recFile.exists() && recFile.isFile()) { diff --git a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java index 8f1a78633..1e4600988 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java @@ -109,7 +109,8 @@ public class ItemPoolsComponent { weighted(ModItems.can_mrsugar, 0, 1, 2, 2), weighted(ModItems.cap_nuka, 0, 1, 16, 2), weighted(ModItems.book_guide, 3, 1, 1, 1), - weighted(ModBlocks.deco_computer, 0, 1, 1, 1) + weighted(ModBlocks.deco_computer, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 0, 1, 1, 1) }; }}; @@ -158,7 +159,8 @@ public class ItemPoolsComponent { weighted(ModItems.powder_bromine, 0, 1, 1, 1), weighted(ModItems.powder_cobalt, 0, 1, 1, 1), weighted(ModItems.powder_neodymium, 0, 1, 1, 1), - weighted(ModItems.powder_boron, 0, 1, 1, 1) + weighted(ModItems.powder_boron, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 1, 1, 1, 1) }; }}; @@ -186,7 +188,9 @@ public class ItemPoolsComponent { weighted(Items.paper, 0, 1, 6, 7), weighted(Items.clock, 0, 1, 1, 3), weighted(Items.book, 0, 1, 5, 10), - weighted(Items.experience_bottle, 0, 1, 3, 1) + weighted(Items.experience_bottle, 0, 1, 3, 1), + weighted(ModItems.blueprint_folder, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 1, 1, 1, 1) }; }}; @@ -222,7 +226,7 @@ public class ItemPoolsComponent { weighted(ModItems.pellet_rtg_weak,0, 0, 1, 1), }; }}; - + new ItemPool(POOL_REPAIR_MATERIALS) {{ this.pool = new WeightedRandomChestContent[] { weighted(ModItems.ingot_aluminium, 0, 2, 8, 3), diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java index 44f9d046f..c70d33501 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java @@ -271,8 +271,8 @@ public class XFactory12ga { g12_phosphorus = new BulletConfig().setItem(EnumAmmo.G12_PHOSPHORUS).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 6).setProjectiles(8).setDamage(1F/8F).setSpread(magnumSpread).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x910001, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_PHOSPHORUS")) .setOnImpact((bullet, mop) -> { if(mop.entityHit != null && mop.entityHit instanceof EntityLivingBase) { HbmLivingProps data = HbmLivingProps.getData((EntityLivingBase) mop.entityHit); if(data.phosphorus < 300) data.phosphorus = 300; } }); //g12_anthrax = new BulletConfig().setItem(EnumAmmo.G12_ANTHRAX).setProjectiles(8).setDamage(1F/8F).setSpread(0.015F).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x749300, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_ANTHRAX")); - g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianBJ")); - g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianTKR")); + g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianBJ")); + g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianTKR")); BulletConfig[] all = new BulletConfig[] {g12_bp, g12_bp_magnum, g12_bp_slug, g12, g12_slug, g12_flechette, g12_magnum, g12_explosive, g12_phosphorus}; diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/hundun.png b/src/main/resources/assets/hbm/textures/models/trinkets/hundun.png index 70bf3b41ac40518fd407ed9e49c36f0326b127e1..ab600170cdf0a4dad27b1d005d397327eafa9c19 100644 GIT binary patch delta 3221 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 Hu0mjfP02he delta 1302 zcmV+x1?l>z8Mq3NGk*l{NklF>4e-6vyAn6^bAd4nmqhB&IZtLI@T%Vl6`O z6Qt3gL`%sfBG^Pxf);)Pi3G8ox08D_|9NkA=aPVd!_Do~bj~0~XQq=f@6U66-8Bw3w|~>3*T>hT{yWOrqoPrD z10wlI0kRI103^0$o!v@0!26w(tZ_Fd&y^kts*zq+xqL%7QRiq~y~%EE6rgSn$H!?i(PTQF; zhU?&I_Gk|}BU8}%@*QAgDjWT(kx0=tlMSIrwko7jG8t-n0BXm#B+19;lVky%^^Jk` zXXkk4a;^@6DLVa7Pg_OowLqWy0}x~Zvh&9l#^GRXzklzzv%W#z39z$OWq|*kq)g`+ zCI!G?MUcsx1sD}zY+-!h>!Kr2qH?S%n8F>Q2*acR*x4;bMj+yVJQ)B$jt+3Jwy*63 z9L~p3N97ou0+>dmtpb#_w}NCGmszp^A?+uJqI^YJ=D;-i0cckLhDiZ9@HP!J-N~a0 z2yN%yB7bwWOMA9dwi1|!K~5f>nNGxy%Qn@G2KO8*({4_bUh}tUPoB;p-%X9`fY z)BynOE-t0wC(rrMUcBo0T?R^9lsJh2d~kkVbc#?^Da8A*<9$&cb_MXs`68>~TD=@b zyv+ir*j-#og~ONc-R{2l`CS%EbY8E*h3Aj^Vt)lZLd(W3SMNS0wMPZ30{Afc<y=TpuFFURZXG9pgF+DEd?}wE|GvqoVdxfb3k=4W&Vd!0o~PJ0xwPwnu^U=K)O7 zZEMQP4a0R}8-Zly66j1<9`_#lV zFs6aL*nR-MJS!IpPO<=BMuCvrJngYL*MF6L4jMSh&csCGu_wD(*Cs5$s6u<=@iKcrXZ6f=+J%P6NxqpZX z5IB7bfY$*`&kLB|-<{(D0FI%ztOnQ5PhRV}PSGII)Lzqh0^1!=wtE6y#|%ysU@qN) zxpb>=Il@Q6op=6%ubDH~lgj`AR%NUJ)Nnty@B6+0_8<_CY+aqMJkQs(4DLO9KJEz= z#2_$moTPzIzWo6JfJc{37bI&&j^c`ItBb1P;3boWJ-m8v(1R zZWRE2|6EP;o*$v7as?3cJw7gq?mP3-fB!>AR}K~96G51=^;IFhLS6nAZJV!EuPc=+ zfE?*lM*Vpl8@lsriAv_>I@NK=RIUIV2$`4VUhWiCwJQ>dMEv3}8p}e@3lB01b^rhX M07*qoM6N<$f=JkPa{vGU