diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/Main.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/Main.java index a50fc23..f60f0d7 100644 --- a/src/main/java/eu/mhsl/minecraft/pixelblocks/Main.java +++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/Main.java @@ -28,10 +28,6 @@ public final class Main extends JavaPlugin { public final static List pixelBlocks = new ArrayList<>(); - public static TaskChain chain() { - return taskFactory.newChain(); - } - public static TaskChain sharedChain(String name) { return taskFactory.newSharedChain(name); } @@ -46,7 +42,6 @@ public final class Main extends JavaPlugin { Main.configuration = new PixelBlockConfiguration( config.getInt(PixelBlockConfiguration.Keys.PixelsPerBlock.getKey()), - config.getDouble(PixelBlockConfiguration.Keys.HitboxOffset.getKey()), config.getBoolean(PixelBlockConfiguration.Keys.OnlyBreakableByOwners.getKey()), config.getBoolean(PixelBlockConfiguration.Keys.OnlyEditableByOwners.getKey()) ); diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/PixelBlockConfiguration.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/PixelBlockConfiguration.java index e54f8f8..383fa0e 100644 --- a/src/main/java/eu/mhsl/minecraft/pixelblocks/PixelBlockConfiguration.java +++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/PixelBlockConfiguration.java @@ -5,13 +5,11 @@ import org.jetbrains.annotations.NotNull; public record PixelBlockConfiguration( int pixelsPerBlock, - double hitboxOffset, boolean onlyBreakableByOwner, boolean onlyEditableByOwner ) { public static void setDefaults(FileConfiguration config) { config.addDefault(Keys.PixelsPerBlock.key, 16); - config.addDefault(Keys.HitboxOffset.key, 0.005); config.addDefault(Keys.OnlyBreakableByOwners.key, false); config.addDefault(Keys.OnlyEditableByOwners.key, true); config.options().copyDefaults(true); @@ -19,7 +17,6 @@ public record PixelBlockConfiguration( public enum Keys { PixelsPerBlock("pixelsPerBlock"), - HitboxOffset("hitboxOffset"), OnlyBreakableByOwners("onlyBreakableByOwners"), OnlyEditableByOwners("onlyEditableByOwners"); diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java index 29afaa7..5d1be1c 100644 --- a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java +++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java @@ -1,6 +1,5 @@ package eu.mhsl.minecraft.pixelblocks.listeners; -import eu.mhsl.minecraft.pixelblocks.Main; import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlock; import io.papermc.paper.event.player.PrePlayerAttackEntityEvent; import org.bukkit.Location; @@ -13,7 +12,7 @@ public class BreakPixelBlockListener implements Listener { public void destroyPixelBlock(PrePlayerAttackEntityEvent event) { if(!(event.getAttacked() instanceof Interaction)) return; - Location blockLocation = event.getAttacked().getLocation().add(0, Main.configuration().hitboxOffset(), 0).toBlockLocation(); + Location blockLocation = event.getAttacked().getLocation().toBlockLocation(); PixelBlock pixelBlock = PixelBlock.getPixelBlockFromPlacedLocation(blockLocation); if(pixelBlock == null) return; pixelBlock.destroy(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/EnterPixelBlockListener.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/EnterPixelBlockListener.java index ef39746..43d864a 100644 --- a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/EnterPixelBlockListener.java +++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/EnterPixelBlockListener.java @@ -1,6 +1,5 @@ package eu.mhsl.minecraft.pixelblocks.listeners; -import eu.mhsl.minecraft.pixelblocks.Main; import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlock; import org.bukkit.Location; import org.bukkit.entity.Interaction; @@ -16,7 +15,6 @@ public class EnterPixelBlockListener implements Listener { Location interactionLocation = event .getRightClicked() .getLocation() - .add(0, Main.configuration().hitboxOffset(), 0) .toBlockLocation(); PixelBlock pixelBlock = PixelBlock.getPixelBlockFromPlacedLocation(interactionLocation); if(pixelBlock == null) return; diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/pixelblock/PixelBlockHitbox.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/pixelblock/PixelBlockHitbox.java index 2d8d254..5d9e522 100644 --- a/src/main/java/eu/mhsl/minecraft/pixelblocks/pixelblock/PixelBlockHitbox.java +++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/pixelblock/PixelBlockHitbox.java @@ -1,6 +1,7 @@ package eu.mhsl.minecraft.pixelblocks.pixelblock; import eu.mhsl.minecraft.pixelblocks.Main; +import eu.mhsl.minecraft.pixelblocks.utils.MinMaxUtil; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.entity.Entity; @@ -23,62 +24,61 @@ public class PixelBlockHitbox { public void spawn() { Location absoluteLocation = this.parentBlock.getPixelBlockLocation(); List pixels = this.parentBlock.getPixelData(); - float offset = (float) Main.configuration().hitboxOffset(); int pixelsPerBlock = Main.configuration().pixelsPerBlock(); Interaction interaction; - if (pixels.size() <= 5 || true) { + if (pixels.size() <= 5) { interaction = (Interaction) absoluteLocation.getWorld().spawnEntity( - absoluteLocation.clone().add(0.5, -offset, 0.5), + absoluteLocation.clone().add(0.5, -0, 0.5), EntityType.INTERACTION ); - interaction.setInteractionHeight(1 + 2 * offset); - interaction.setInteractionWidth(1 + 2 * offset); + interaction.setInteractionHeight(1); + interaction.setInteractionWidth(1); } else { -// double startingX = absoluteLocation.x() + MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getX()); -// double startingY = absoluteLocation.y() + MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getY()); -// double startingZ = absoluteLocation.z() + MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getZ()); -// -// double endingX = absoluteLocation.x() + MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getX()); -// double endingY = absoluteLocation.y() + MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getY()); -// double endingZ = absoluteLocation.z() + MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getZ()); -// -// Location spawnLocation = absoluteLocation.clone().add( -// ((startingX+endingX+1)/2)/pixelsPerBlock, -// ((startingY+endingY+1)/2)/pixelsPerBlock, -// ((startingZ+endingZ+1)/2)/pixelsPerBlock -// ); + double startingX = MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getX()); + double startingY = MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getY()); + double startingZ = MinMaxUtil.getMinProperty(pixels, pixel -> pixel.relativeLocation().getZ()); -// float height = (float) (endingY-startingY+1)/pixelsPerBlock + 2*offset; -// -// float width; -// if((endingX-startingX) > (endingZ-startingZ)) { -// width = (float) (endingX-startingX+1)/pixelsPerBlock + 2*offset; -// } else { -// width = (float) (endingZ-startingZ+1)/pixelsPerBlock + 2*offset; -// } -// -// if(spawnLocation.getX()+width/2 > pixelBlockLocation.getX()+1) { -// spawnLocation.subtract((spawnLocation.getX()+width/2)-(pixelBlockLocation.getX()+1), 0, 0); -// } -// if(spawnLocation.getX()-width/2 < pixelBlockLocation.getX()) { -// spawnLocation.add(pixelBlockLocation.getX()-(spawnLocation.getX()-width/2), 0, 0); -// } -// -// if(spawnLocation.getZ()+width/2 > pixelBlockLocation.getZ()+1) { -// spawnLocation.subtract(0, 0, (spawnLocation.getZ()+width/2)-(pixelBlockLocation.getZ()+1)); -// } -// if(spawnLocation.getZ()-width/2 < pixelBlockLocation.getZ()) { -// spawnLocation.add(0, 0, pixelBlockLocation.getZ()-(spawnLocation.getZ()-width/2)); -// } + double endingX = MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getX()); + double endingY = MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getY()); + double endingZ = MinMaxUtil.getMaxProperty(pixels, pixel -> pixel.relativeLocation().getZ()); -// interaction = (Interaction) absoluteLocation.getWorld().spawnEntity( -// spawnLocation, -// EntityType.INTERACTION -// ); -// -// interaction.setInteractionHeight(0.5f); -// interaction.setInteractionWidth(0.5f); + Location spawnLocation = absoluteLocation.clone().add( + ((startingX+endingX)/2)/pixelsPerBlock, + (startingY/pixelsPerBlock)-0, + ((startingZ+endingZ)/2)/pixelsPerBlock + ); + + float height = (float) (endingY-startingY+1)/pixelsPerBlock; + + float width; + if((endingX-startingX) > (endingZ-startingZ)) { + width = (float) (endingX-startingX+1)/pixelsPerBlock; + } else { + width = (float) (endingZ-startingZ+1)/pixelsPerBlock; + } + + if(spawnLocation.getX()+width/2 > absoluteLocation.getX()+1) { + spawnLocation.subtract((spawnLocation.getX()+width/2)-(absoluteLocation.getX()+1), 0, 0); + } + if(spawnLocation.getX()-width/2 < absoluteLocation.getX()) { + spawnLocation.add(absoluteLocation.getX()-(spawnLocation.getX()-width/2), 0, 0); + } + + if(spawnLocation.getZ()+width/2 > absoluteLocation.getZ()+1) { + spawnLocation.subtract(0, 0, (spawnLocation.getZ()+width/2)-(absoluteLocation.getZ()+1)); + } + if(spawnLocation.getZ()-width/2 < absoluteLocation.getZ()) { + spawnLocation.add(0, 0, absoluteLocation.getZ()-(spawnLocation.getZ()-width/2)); + } + + interaction = (Interaction) absoluteLocation.getWorld().spawnEntity( + spawnLocation, + EntityType.INTERACTION + ); + + interaction.setInteractionHeight(height); + interaction.setInteractionWidth(width); } interaction.getPersistentDataContainer()