From 524e79008fa804355f9110d92316b87fda8156e2 Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Mon, 4 Jan 2021 21:57:54 +0300 Subject: [PATCH] Removed some leftover debug content --- .../windcorp/progressia/test/TestContent.java | 30 ------------------ .../assets/textures/blocks/compass.png | Bin 256 -> 0 bytes .../assets/textures/blocks/glass.png | Bin 644 -> 0 bytes .../assets/textures/blocks/glass_clear.png | Bin 5475 -> 0 bytes .../assets/textures/blocks/side_east.png | Bin 588 -> 0 bytes .../assets/textures/blocks/side_north.png | Bin 609 -> 0 bytes .../assets/textures/blocks/side_south.png | Bin 591 -> 0 bytes .../assets/textures/blocks/side_west.png | Bin 604 -> 0 bytes 8 files changed, 30 deletions(-) delete mode 100644 src/main/resources/assets/textures/blocks/compass.png delete mode 100644 src/main/resources/assets/textures/blocks/glass.png delete mode 100644 src/main/resources/assets/textures/blocks/glass_clear.png delete mode 100644 src/main/resources/assets/textures/blocks/side_east.png delete mode 100644 src/main/resources/assets/textures/blocks/side_north.png delete mode 100644 src/main/resources/assets/textures/blocks/side_south.png delete mode 100644 src/main/resources/assets/textures/blocks/side_west.png diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java index 4066a14..b29905b 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestContent.java +++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java @@ -22,7 +22,6 @@ import ru.windcorp.progressia.common.collision.CollisionModel; import ru.windcorp.progressia.common.comms.controls.*; import ru.windcorp.progressia.common.io.ChunkIO; import ru.windcorp.progressia.common.state.StatefulObjectRegistry.Factory; -import ru.windcorp.progressia.common.world.ChunkData; import ru.windcorp.progressia.common.world.block.*; import ru.windcorp.progressia.common.world.entity.*; import ru.windcorp.progressia.common.world.tile.*; @@ -75,14 +74,6 @@ public class TestContent { register(new BlockRenderOpaqueCube(id, getBlockTexture("granite_" + type.toLowerCase()))); register(new BlockLogic(id)); } - - register(new BlockData("Test:Compass")); - register(new BlockRenderOpaqueCube("Test:Compass", getBlockTexture("compass"))); - register(new BlockLogic("Test:Compass")); - - register(new BlockData("Test:Glass")); - register(new BlockRenderTransparentCube("Test:Glass", getBlockTexture("glass_clear"))); - register(new BlockLogic("Test:Glass")); } private static void registerTiles() { @@ -131,27 +122,6 @@ public class TestContent { ControlTriggerRegistry triggers = ControlTriggerRegistry.getInstance(); ControlLogicRegistry logic = ControlLogicRegistry.getInstance(); - data.register("Test:Switch000", ControlData::new); - triggers.register(ControlTriggers.of( - "Test:Switch000", - KeyEvent.class, - KeyMatcher.of(GLFW.GLFW_KEY_H).matcher() - )); - logic.register(ControlLogic.of("Test:Switch000", (server, packet, client) -> { - Vec3i z000 = new Vec3i(0, 0, 0); - - ChunkData chunk = server.getWorld().getChunk(z000).getData(); - - BlockData block; - if (chunk.getBlock(z000).getId().equals("Test:Stone")) { - block = BlockDataRegistry.getInstance().get("Test:Glass"); - } else { - block = BlockDataRegistry.getInstance().get("Test:Stone"); - } - - server.getWorldAccessor().setBlock(z000, block); - })); - data.register("Test:BreakBlock", ControlBreakBlockData::new); triggers.register(ControlTriggers.of( "Test:BreakBlock", diff --git a/src/main/resources/assets/textures/blocks/compass.png b/src/main/resources/assets/textures/blocks/compass.png deleted file mode 100644 index 642b73a3f295ff3dee2b6188b10f1821e73055e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 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