From eb5aa59941efdf5605b805f0c4b7fa54eb3658b8 Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Sat, 11 Sep 2021 21:12:42 +0300 Subject: [PATCH] Removed plain sand block and tile; incremented version To be honest, I kinda forgot to increment version in last commit, so I decided to make a pointless change to justify an entire commit =\ --- .../ru/windcorp/progressia/test/LayerAbout.java | 2 +- .../ru/windcorp/progressia/test/TestContent.java | 2 -- .../test/gen/feature/TestGrassFeature.java | 1 - .../resources/assets/textures/blocks/Sand.png | Bin 1649 -> 0 bytes .../resources/assets/textures/tiles/Sand.png | Bin 8841 -> 0 bytes 5 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 src/main/resources/assets/textures/blocks/Sand.png delete mode 100644 src/main/resources/assets/textures/tiles/Sand.png diff --git a/src/main/java/ru/windcorp/progressia/test/LayerAbout.java b/src/main/java/ru/windcorp/progressia/test/LayerAbout.java index 334b462..fae2357 100644 --- a/src/main/java/ru/windcorp/progressia/test/LayerAbout.java +++ b/src/main/java/ru/windcorp/progressia/test/LayerAbout.java @@ -50,7 +50,7 @@ public class LayerAbout extends GUILayer { new Label( "Version", font, - new MutableStringLocalized("LayerAbout.Version").format("pre-alpha 2") + new MutableStringLocalized("LayerAbout.Version").format("pre-alpha 3") ) ); diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java index 3651f60..5e9ea98 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestContent.java +++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java @@ -108,7 +108,6 @@ public class TestContent { registerSimplestBlock("Water"); registerSimplestBlock("Brick"); registerSimplestBlock("BrickWhite"); - registerSimplestBlock("Sand"); registerSimplestBlock("Concrete"); registerSimplestBlock("WoodenPlank"); @@ -195,7 +194,6 @@ public class TestContent { }); registerSimplestTransparentTile("Stones"); - registerSimplestTransparentTile("Sand"); registerSimplestOpaqueTile("SnowOpaque"); Arrays.asList( diff --git a/src/main/java/ru/windcorp/progressia/test/gen/feature/TestGrassFeature.java b/src/main/java/ru/windcorp/progressia/test/gen/feature/TestGrassFeature.java index add06ec..d854bf4 100644 --- a/src/main/java/ru/windcorp/progressia/test/gen/feature/TestGrassFeature.java +++ b/src/main/java/ru/windcorp/progressia/test/gen/feature/TestGrassFeature.java @@ -67,7 +67,6 @@ public class TestGrassFeature extends SurfaceTopLayerFeature { private final List scatter = ImmutableList.of( TileDataRegistry.getInstance().get("Test:Stones"), - TileDataRegistry.getInstance().get("Test:Sand"), TileDataRegistry.getInstance().get("Test:Bush"), TileDataRegistry.getInstance().get("Test:Fern") ); diff --git a/src/main/resources/assets/textures/blocks/Sand.png b/src/main/resources/assets/textures/blocks/Sand.png deleted file mode 100644 index 3520cb2df143df7dd3796ddaeaff2834075880e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1649 zcmV-%29EiOP)EX>4Tx04R}tkvmAkP!xv$riu?LB6bjQ2vR#)5EXHhDi*;)X)CnqU~glg%>V!Z8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b z1X@W%K~y-)EtJcS9LE(zBW`A8Rllld1|&s^V}Q^`{sDi!_u6U4g>AqvAY0^UT0Pxe z&&<5{deQoVIPpO6=b!)Xo<(+QLux*#F77MYlF5Am1H6drRIlzi#&tZ$X~i zSG612nJ+mnU;wD9ZnJv@j1V%l>7DtcHknT`HP2PgDL&8h8z6wGy#;v?5qFQ_(QI{O zksW{#j#baX0E(lo>o-ap!(OBnvl+14_>1}C$beM6xMwpnTg_&W!p>}%*MF&A35lT- z?ujUJXwzfY9o$QF)J^x1OsRP&$-U!%|-zG?N7P933oZah#UYk z&30Y?0AM}~5!dxfq*^N=WHcMAUbdSb%+_hTRQ)4_{&@Vf=2s$_jbtKI*B#roB?H+6 z>0{LkfEXUluI7tyBXVfde$69b07^Lp*cd#U=qWj>I<2wo`szw6VYr`n`7wt=l@2saj#wX(LAf3$asg}?;p)4cayss*#y~< zDTe-jeK8!(G7%l7b~Rf8%Xt*(9A4@PkfwQ9mgVkL0Oaxl28RJy^KW1P(6&9VBD00000NkvXXu0mjf-zf&z diff --git a/src/main/resources/assets/textures/tiles/Sand.png b/src/main/resources/assets/textures/tiles/Sand.png deleted file mode 100644 index 2530ce81eed34fc677b31117a1b7edfeab824ad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8841 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