diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 458d71a73..ab706a427 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,7 +2,7 @@ name: Build and test Minestom on: pull_request: - branches: [ main ] + branches: [ master ] jobs: build: diff --git a/.github/workflows/snapshot-deploy.yaml b/.github/workflows/snapshot-deploy.yaml index b03019a53..e01b4223a 100644 --- a/.github/workflows/snapshot-deploy.yaml +++ b/.github/workflows/snapshot-deploy.yaml @@ -2,7 +2,7 @@ name: Gradle Publish to Maven Central on: push: - branches: [ main ] + branches: [ master ] jobs: build: diff --git a/.github/workflows/trigger-jitpack-build.yml b/.github/workflows/trigger-jitpack-build.yml index fb4bcd93b..8366c4f6f 100644 --- a/.github/workflows/trigger-jitpack-build.yml +++ b/.github/workflows/trigger-jitpack-build.yml @@ -1,7 +1,7 @@ name: Trigger Jitpack Build on: push: - branches: [ main ] + branches: [ master ] workflow_dispatch: jobs: diff --git a/demo/src/main/java/net/minestom/demo/PlayerInit.java b/demo/src/main/java/net/minestom/demo/PlayerInit.java index 29c62db77..8a626288f 100644 --- a/demo/src/main/java/net/minestom/demo/PlayerInit.java +++ b/demo/src/main/java/net/minestom/demo/PlayerInit.java @@ -121,14 +121,10 @@ public class PlayerInit { var itemStack = event.getItemStack(); var block = event.getInstance().getBlock(event.getPosition()); - event.getPlayer().sendMessage("MESSAGE " + ThreadLocalRandom.current().nextDouble()); - if ("false".equals(block.getProperty("waterlogged")) && itemStack.material().equals(Material.WATER_BUCKET)) { block = block.withProperty("waterlogged", "true"); - System.out.println("SET WATERLOGGER"); } else if ("true".equals(block.getProperty("waterlogged")) && itemStack.material().equals(Material.BUCKET)) { block = block.withProperty("waterlogged", "false"); - System.out.println("SET NOT WATERLOGGED"); } else return; event.getInstance().setBlock(event.getPosition(), block); @@ -145,15 +141,6 @@ public class PlayerInit { instanceContainer.setGenerator(unit -> unit.modifier().fillHeight(0, 40, Block.STONE)); instanceContainer.setChunkSupplier(LightingChunk::new); - // System.out.println("start"); - // var chunks = new ArrayList>(); - // ChunkUtils.forChunksInRange(0, 0, 32, (x, z) -> chunks.add(instanceContainer.loadChunk(x, z))); - - // CompletableFuture.runAsync(() -> { - // CompletableFuture.allOf(chunks.toArray(CompletableFuture[]::new)).join(); - // System.out.println("load end"); - // }); - inventory = new Inventory(InventoryType.CHEST_1_ROW, Component.text("Test inventory")); inventory.setItemStack(3, ItemStack.of(Material.DIAMOND, 34)); }