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 642b73a..0000000 Binary files a/src/main/resources/assets/textures/blocks/compass.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/glass.png b/src/main/resources/assets/textures/blocks/glass.png deleted file mode 100644 index b7de889..0000000 Binary files a/src/main/resources/assets/textures/blocks/glass.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/glass_clear.png b/src/main/resources/assets/textures/blocks/glass_clear.png deleted file mode 100644 index c48cc37..0000000 Binary files a/src/main/resources/assets/textures/blocks/glass_clear.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/side_east.png b/src/main/resources/assets/textures/blocks/side_east.png deleted file mode 100644 index 696e93a..0000000 Binary files a/src/main/resources/assets/textures/blocks/side_east.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/side_north.png b/src/main/resources/assets/textures/blocks/side_north.png deleted file mode 100644 index 441d376..0000000 Binary files a/src/main/resources/assets/textures/blocks/side_north.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/side_south.png b/src/main/resources/assets/textures/blocks/side_south.png deleted file mode 100644 index 9a1e71b..0000000 Binary files a/src/main/resources/assets/textures/blocks/side_south.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/side_west.png b/src/main/resources/assets/textures/blocks/side_west.png deleted file mode 100644 index 05c2695..0000000 Binary files a/src/main/resources/assets/textures/blocks/side_west.png and /dev/null differ