xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

augh

Browse Source
This commit is contained in:
Bob 2025-04-19 17:43:49 +02:00
parent 5372884c50
commit d9498cb2dc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/hbm/blocks/generic/DungeonSpawner.java
View File

@ -87,13 +87,13 @@ public class DungeonSpawner extends BlockContainer {
int z = tile.zCoord; int z = tile.zCoord;
if(tile.phase == 0) { if(tile.phase == 0) {
if(world.getTotalWorldTime() % 20 != 0) return false; 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(tile.phase < 3) {
if(world.getTotalWorldTime() % 20 != 0 || tile.timer < 60) return false; 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<TileEntityDungeonSpawner> PHASE_TEST = (tile) -> { public static Consumer<TileEntityDungeonSpawner> PHASE_TEST = (tile) -> {

2
src/main/java/com/hbm/items/tool/ItemConveyorWand.java
View File

@ -506,7 +506,7 @@ public class ItemConveyorWand extends Item implements ILookOverlay {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void printHook(Pre event, World world, int x, int y, int z) { public void printHook(Pre event, World world, int x, int y, int z) {
EntityPlayer player = MainRegistry.proxy.me(); 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); Block block = world.getBlock(x, y, z);
if(block instanceof BlockConveyorBase) { if(block instanceof BlockConveyorBase) {

2
src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java
View File

@ -75,7 +75,7 @@ public class MagazineFullReload extends MagazineSingleTypeBase {
if(config.ammo.matchesRecipe(slot, true)) { if(config.ammo.matchesRecipe(slot, true)) {
int alreadyLoaded = this.getAmount(stack, inventory); 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); int toLoad = Math.min(wantsToLoad, slot.stackSize);
this.setAmount(stack, Math.min((toLoad * config.ammoReloadCount) + alreadyLoaded, this.capacity)); this.setAmount(stack, Math.min((toLoad * config.ammoReloadCount) + alreadyLoaded, this.capacity));
inventory.decrStackSize(i, toLoad); inventory.decrStackSize(i, toLoad);

BIN
src/main/resources/assets/hbm/structures/spire.nbt Normal file
View File

Binary file not shown.