From d9498cb2dcf158e22bba9d1b56bfde04271d1840 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 19 Apr 2025 17:43:49 +0200 Subject: [PATCH] augh --- .../com/hbm/blocks/generic/DungeonSpawner.java | 6 +++--- .../com/hbm/items/tool/ItemConveyorWand.java | 2 +- .../weapon/sedna/mags/MagazineFullReload.java | 2 +- .../resources/assets/hbm/structures/spire.nbt | Bin 0 -> 2227 bytes 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/hbm/structures/spire.nbt diff --git a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java index f74bf86b9..df541e443 100644 --- a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java +++ b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java @@ -87,13 +87,13 @@ public class DungeonSpawner extends BlockContainer { int z = tile.zCoord; if(tile.phase == 0) { if(world.getTotalWorldTime() % 20 != 0) return false; - return !world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(20, 10, 20)).isEmpty(); + //return !world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(20, 10, 20)).isEmpty(); } if(tile.phase < 3) { if(world.getTotalWorldTime() % 20 != 0 || tile.timer < 60) return false; - return world.getEntitiesWithinAABB(EntityUndeadSoldier.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(50, 20, 50)).isEmpty(); + //return world.getEntitiesWithinAABB(EntityUndeadSoldier.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(50, 20, 50)).isEmpty(); } - return true; + return false; }; public static Consumer PHASE_TEST = (tile) -> { diff --git a/src/main/java/com/hbm/items/tool/ItemConveyorWand.java b/src/main/java/com/hbm/items/tool/ItemConveyorWand.java index f3b386723..b393d59f5 100644 --- a/src/main/java/com/hbm/items/tool/ItemConveyorWand.java +++ b/src/main/java/com/hbm/items/tool/ItemConveyorWand.java @@ -506,7 +506,7 @@ public class ItemConveyorWand extends Item implements ILookOverlay { @SideOnly(Side.CLIENT) public void printHook(Pre event, World world, int x, int y, int z) { EntityPlayer player = MainRegistry.proxy.me(); - if(player == null || !player.isSneaking()) return; + if(player == null || !player.isSneaking() || !player.capabilities.isCreativeMode) return; Block block = world.getBlock(x, y, z); if(block instanceof BlockConveyorBase) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java b/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java index f93420294..25f25c2c1 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java @@ -75,7 +75,7 @@ public class MagazineFullReload extends MagazineSingleTypeBase { if(config.ammo.matchesRecipe(slot, true)) { int alreadyLoaded = this.getAmount(stack, inventory); - int wantsToLoad = (int) Math.ceil((double) this.getCapacity(stack) / (double) config.ammoReloadCount) - (alreadyLoaded / config.ammoReloadCount); + int wantsToLoad = (int) Math.ceil((double) (this.getCapacity(stack) - alreadyLoaded) / (double) config.ammoReloadCount); int toLoad = Math.min(wantsToLoad, slot.stackSize); this.setAmount(stack, Math.min((toLoad * config.ammoReloadCount) + alreadyLoaded, this.capacity)); inventory.decrStackSize(i, toLoad); diff --git a/src/main/resources/assets/hbm/structures/spire.nbt b/src/main/resources/assets/hbm/structures/spire.nbt new file mode 100644 index 0000000000000000000000000000000000000000..0a23bdd399d794f7b77e6b0e44e33832094f9563 GIT binary patch literal 2227 zcma)-3p87K9>*()sn)Bdu1A?Zv?G*c6s1*F+jOT>A#D`fAZ1a{PNW&*k&@{wZQZcu z)T3(XPLvcIuW1uPWU7rKV!M$+y-H3}q-0c+Aj&3mXLq*e%+5WZ|GD4a1n5O*Q-3d_g|!`UnA--`I1K7XTG`iV4_#`qK2mH7 z_Sgf3=ixAQAz_oVI}Y-!%&dS-h!Y%|3W^+ahtIOfXr%$zdIdK?`p@Q~h)7IX?n2fB z?JC!3EHBWYq?+IdJsW>E5EQrvnE^59N|MWFI*->%w^8ZNU@IFwyYiU!|AVTTwblR+ zL+Trpn}~BnO(3oe2IueJ;4qx8#!&-mH&AT|3Us)!5D`yX^k-_^ez2whUW0thbY(m( zt=5iK*b1uRzPS@!F(x|la>dOrtS*vZ|0<-w51-d(mVHaY)uXUg%${y zO9UqR35|CHeaD3Q={{r>66^s#EQlP(V%n?IgD+eF0-s*8jO0GW_NiwlnZYjFxY$eL z^v)jAObN=caBj#EaBNW8=|>zSu-YiFW*k955OH)*c+l>W+O0gHjwB93Xi3P!OYNJN z|9Z3Tbkt(Vi#`cy0UN!@UW(Pm4?(9IcrsGgL-V1ECMfW!Q`eli)c$BVID1e1DLrze z_ea($pO-_uFREm1#Si@^mOZzZDLXl--ul)mv^xK%_-D+;Yt~0(UF5}UZG>^}({{XP z{`ue6ebel*_4Vv$xFCN>OhX+?wYR1YmBYoG$Q>KX1rc=i8Oh;g7`?722h63tA`=#l zEyKjAA3qM)k))XbucBVUzG~Sy$&v)(yy_uR4+rkdNJTTprra)cM%)vj+ShatNpuH< zV>nF8b@Z5lCLo6528d+zpza41;n+Z|k|ck#b{(zs1X~9$4YV6l$1CauNyR_7<1kJf zW_*m&YgJX3qV#u{?UK$t8b8RYFW=7+N@iE5@`WSwX+$NdlktrHM?WFbCP-n{%u%~nIU1HDH1S}&P z|EiZ5Kg>)r5an$M)OHbnFzMig!((}<|Z=Zxv5#_5Y!D;t*{mkpE! zJo27`QqX;RNLO1xn1RDAk~M+u-uL_}yAd4jcHae&;klReOmuA*vi0R&JFLXCAVO;D0o5(#8N#W-M0##Tb0``t7qeIPcs{c zr&Z92NG#a0DMlMvn*!sLjn=h5wl|jc`TX*tcbAmd%LR4?~hDSy=EQbfm@ z9QC2tVsWEs*i14$Jy>CWzdJQnwJ&)mQf>$ckK!=0EOfiJCNNuk&#$r@0o;F$tiGCw zO?V^6$kEMzR9-sHLd3lT)v%eKSNB+Tc{PA|5!2I}Y7@+*=@lVn)!B=LkeDK`ebGr^ ztqYb4#VcqGRPkme&}9@ zSRjR~fLx1s_sdLjT^$u(bD@i76f%<2F@_Dq(P8kx{qSN{mW4=C3jH^_l4M!@rGcD( zj41yIAr#8uLTXs;B?U3R#;L5j9@Rq>_lRk{SFEbqZ=I+|{OUne*%5&e0^%>vQ zw==#ON)P4KYy6F=?(lTQI?1kot*nE^ZUZvJQvYy8{(8&}m@xB8hEyzviQ5*8&J8IJ JMFecw@-JtvQV0M5 literal 0 HcmV?d00001