From 76a6c4a1863e7374a10e91eefab1d0f7adad9b5c Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Mon, 11 Jan 2021 00:07:34 +0300 Subject: [PATCH] Made glass not remove tiles under itself and updated 2 textures - Glass is no longer solid and is now transparent - Updated Clock and Wallpaper textures --- .../progressia/test/TestBlockLogicGlass.java | 22 ++++++++++++++++++ .../windcorp/progressia/test/TestContent.java | 2 +- .../resources/assets/textures/tiles/Clock.png | Bin 764 -> 3036 bytes .../assets/textures/tiles/Wallpaper.png | Bin 952 -> 4960 bytes 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java diff --git a/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java new file mode 100644 index 0000000..578c3e4 --- /dev/null +++ b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java @@ -0,0 +1,22 @@ +package ru.windcorp.progressia.test; + +import ru.windcorp.progressia.common.world.block.BlockFace; +import ru.windcorp.progressia.server.world.block.BlockLogic; + +public class TestBlockLogicGlass extends BlockLogic { + + public TestBlockLogicGlass(String id) { + super(id); + } + + @Override + public boolean isSolid(BlockFace face) { + return false; + } + + @Override + public boolean isTransparent() { + return true; + } + +} diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java index 857012a..e222a9c 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestContent.java +++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java @@ -98,7 +98,7 @@ public class TestContent { register(new BlockData("Test:Glass")); register(new BlockRenderTransparentCube("Test:Glass", getBlockTexture("Glass"))); - register(new BlockLogic("Test:Glass")); + register(new TestBlockLogicGlass("Test:Glass")); register(new BlockData("Test:Sand")); register(new BlockRenderOpaqueCube("Test:Sand", getBlockTexture("Sand"))); diff --git a/src/main/resources/assets/textures/tiles/Clock.png b/src/main/resources/assets/textures/tiles/Clock.png index 2d36e96850a5635da5995317f55185198d51213e..40150681a979bdc8c68d84826990662f28e39d52 100644 GIT binary patch delta 2996 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 qkUaVLk5EX>4Tx04R}tkvmAkP!xv$riu?LB6bjQ z2vR#)5EXHhDi*;)X)CnqU~xX=JaLd%EVQxQ#;j^PmoI{R|$+93#dSa+yFSh+L z26XKLjhbzLAKP~01n@rtS6a(osROg0q}N(n=m_ZF1}?5!n!E>G?f^qix@1U>QNm$2z;a+voOgPjh}hgWPhiu)mr_ z00009a7bBm001r{001r{0eGc9b^rhX2XskIMF-^p2^19rf2R7WlUoWWe*oo4L_t(Y z$L*9ou7fZPfNdOx9D)Ibg*gkHh4Uh@FtZ@#8X)5MP4Iry0!@Wl>D5bqZ0AcH+t@S> zTqy}$EFZw@0qV$L97kD}1+><{%)rb*M35v2wThxB@U5HO2k;L7U*PUeKytO$G5`Po07*qoM6N<$g3pUapa1{> diff --git a/src/main/resources/assets/textures/tiles/Wallpaper.png b/src/main/resources/assets/textures/tiles/Wallpaper.png index 52b356a2014aa6813699323d769cbbd58a748783..b1b5ac04869137e7f0c7b427288971a87204e482 100644 GIT binary patch delta 4951 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 VmRdaN3Jd@M002ovPDHLkV1gwXugL%a delta 931 zcmV;U16=&zCb$QXBYyx1a7bBm000ie000ie0hKEb8vp!f`OzDwEO*U#-|9PsX#(&VX{x#yAN~B?+`oiDRkekz>z4T84zf3J~O z3k}k0)VJOAObutksN6XZ3*Er4#rCN;o8H!3n|4=FnLLdpX27av#@00>7}yIcVGC@uf?$T001Q*;L`BWVtDM~Q}ZXHzM4hZItPqG>7<&O&Qi0JLx8rh?a} z*i$jvZHj$yA8WThiq>ig=L24w-W_XQqi$6ft`Q7(bcibqecUEkf&-OxfwQYKYTa-> zPz6zS`eaX$oT;it+#c_Mkw$zMsE~HMX1Y`TF zt*N*I@3{|bgQ~TfD2Tn`Ht(w1baz{GHh=m`$-JXGn14lwOZJU@pnar?_H2c}Z=PVLQ zcvTB)@N1&m>dsEv6j$$s)y@l^#YP031&?Z44iJT@9=;Kp?4@73u6^7#4Y*IK>gPil zSC(tdKZ*Npl((2;C(i4jQoCzIL{OCjU>s)V^nvaV{s;OpD0y+9rY!&f002ovPDHLk FV1fb2s;mG2