diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java index b8a5b33..9e868b4 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestContent.java +++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java @@ -29,6 +29,8 @@ import java.util.Set; import java.util.function.Consumer; import org.lwjgl.glfw.GLFW; +import com.google.common.collect.ImmutableList; + import glm.vec._3.i.Vec3i; import ru.windcorp.progressia.client.ClientState; import ru.windcorp.progressia.client.audio.Sound; @@ -101,13 +103,7 @@ public class TestContent { register(new BlockRenderOpaqueCube("Test:Stone", getBlockTexture("Stone"))); register(new BlockLogic("Test:Stone")); - for (String type : new String[] { "Monolith", "Cracked", "Gravel" }) { - String id = "Test:Granite" + type; - - register(new BlockData(id)); - register(new BlockRenderOpaqueCube(id, getBlockTexture("Granite" + type))); - register(new BlockLogic(id)); - } + registerRocks(); register(new BlockData("Test:Brick")); register(new BlockRenderOpaqueCube("Test:Brick", getBlockTexture("Brick"))); @@ -153,6 +149,36 @@ public class TestContent { } + private static void registerRocks() { + List rockNames = ImmutableList.of( + "BlackGranite", + "Dolomite", + "Eclogite", + "Gabbro", + "Limestone", + "Marble", + "RedGranite" + ); + + List rockVariants = ImmutableList.of( + "Monolith", + "Cracked", + "Gravel", + "Sand" + ); + + for (String name : rockNames) { + for (String variant : rockVariants) { + String fullName = name + variant; + String id = "Test:" + fullName; + + register(new BlockData(id)); + register(new BlockRenderOpaqueCube(id, getBlockTexture(fullName))); + register(new BlockLogic(id)); + } + } + } + private static void registerTiles() { Set placeableBlacklist = new HashSet<>(); diff --git a/src/main/java/ru/windcorp/progressia/test/gen/TestGenerationConfig.java b/src/main/java/ru/windcorp/progressia/test/gen/TestGenerationConfig.java index b4ed652..22a66d7 100644 --- a/src/main/java/ru/windcorp/progressia/test/gen/TestGenerationConfig.java +++ b/src/main/java/ru/windcorp/progressia/test/gen/TestGenerationConfig.java @@ -68,9 +68,9 @@ public class TestGenerationConfig { } private static void registerTerrainLayers(FloatRangeMap layers) { - BlockData granite = BlockDataRegistry.getInstance().get("Test:GraniteMonolith"); - BlockData graniteCracked = BlockDataRegistry.getInstance().get("Test:GraniteCracked"); - BlockData graniteGravel = BlockDataRegistry.getInstance().get("Test:GraniteGravel"); + BlockData granite = BlockDataRegistry.getInstance().get("Test:RedGraniteMonolith"); + BlockData graniteCracked = BlockDataRegistry.getInstance().get("Test:RedGraniteCracked"); + BlockData graniteGravel = BlockDataRegistry.getInstance().get("Test:RedGraniteGravel"); BlockData dirt = BlockDataRegistry.getInstance().get("Test:Dirt"); BlockData air = BlockDataRegistry.getInstance().get("Test:Air"); diff --git a/src/main/resources/assets/textures/blocks/BlackGraniteCracked.png b/src/main/resources/assets/textures/blocks/BlackGraniteCracked.png new file mode 100644 index 0000000..5d3afa4 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/BlackGraniteCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/BlackGraniteGravel.png b/src/main/resources/assets/textures/blocks/BlackGraniteGravel.png new file mode 100644 index 0000000..bd49f48 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/BlackGraniteGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/BlackGraniteMonolith.png b/src/main/resources/assets/textures/blocks/BlackGraniteMonolith.png new file mode 100644 index 0000000..2aff002 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/BlackGraniteMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/BlackGraniteSand.png b/src/main/resources/assets/textures/blocks/BlackGraniteSand.png new file mode 100644 index 0000000..71b867e Binary files /dev/null and b/src/main/resources/assets/textures/blocks/BlackGraniteSand.png differ diff --git a/src/main/resources/assets/textures/blocks/DolomiteCracked.png b/src/main/resources/assets/textures/blocks/DolomiteCracked.png new file mode 100644 index 0000000..46feff6 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/DolomiteCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/DolomiteGravel.png b/src/main/resources/assets/textures/blocks/DolomiteGravel.png new file mode 100644 index 0000000..7b28fa6 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/DolomiteGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/DolomiteMonolith.png b/src/main/resources/assets/textures/blocks/DolomiteMonolith.png new file mode 100644 index 0000000..0cdc259 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/DolomiteMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/DolomiteSand.png b/src/main/resources/assets/textures/blocks/DolomiteSand.png new file mode 100644 index 0000000..b419bcf Binary files /dev/null and b/src/main/resources/assets/textures/blocks/DolomiteSand.png differ diff --git a/src/main/resources/assets/textures/blocks/EclogiteCracked.png b/src/main/resources/assets/textures/blocks/EclogiteCracked.png new file mode 100644 index 0000000..585efcf Binary files /dev/null and b/src/main/resources/assets/textures/blocks/EclogiteCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/EclogiteGravel.png b/src/main/resources/assets/textures/blocks/EclogiteGravel.png new file mode 100644 index 0000000..9e72e13 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/EclogiteGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/EclogiteMonolith.png b/src/main/resources/assets/textures/blocks/EclogiteMonolith.png new file mode 100644 index 0000000..b5e61ff Binary files /dev/null and b/src/main/resources/assets/textures/blocks/EclogiteMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/EclogiteSand.png b/src/main/resources/assets/textures/blocks/EclogiteSand.png new file mode 100644 index 0000000..d00b06d Binary files /dev/null and b/src/main/resources/assets/textures/blocks/EclogiteSand.png differ diff --git a/src/main/resources/assets/textures/blocks/GabbroCracked.png b/src/main/resources/assets/textures/blocks/GabbroCracked.png new file mode 100644 index 0000000..5388eb3 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/GabbroCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/GabbroGravel.png b/src/main/resources/assets/textures/blocks/GabbroGravel.png new file mode 100644 index 0000000..0a1038b Binary files /dev/null and b/src/main/resources/assets/textures/blocks/GabbroGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/GabbroMonolith.png b/src/main/resources/assets/textures/blocks/GabbroMonolith.png new file mode 100644 index 0000000..4ef7045 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/GabbroMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/GabbroSand.png b/src/main/resources/assets/textures/blocks/GabbroSand.png new file mode 100644 index 0000000..b562d38 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/GabbroSand.png differ diff --git a/src/main/resources/assets/textures/blocks/GraniteCracked.png b/src/main/resources/assets/textures/blocks/GraniteCracked.png deleted file mode 100644 index 508a193..0000000 Binary files a/src/main/resources/assets/textures/blocks/GraniteCracked.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/GraniteGravel.png b/src/main/resources/assets/textures/blocks/GraniteGravel.png deleted file mode 100644 index 7d7e35b..0000000 Binary files a/src/main/resources/assets/textures/blocks/GraniteGravel.png and /dev/null differ diff --git a/src/main/resources/assets/textures/blocks/LimestoneCracked.png b/src/main/resources/assets/textures/blocks/LimestoneCracked.png new file mode 100644 index 0000000..588f836 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/LimestoneCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/LimestoneGravel.png b/src/main/resources/assets/textures/blocks/LimestoneGravel.png new file mode 100644 index 0000000..d5229d7 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/LimestoneGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/LimestoneMonolith.png b/src/main/resources/assets/textures/blocks/LimestoneMonolith.png new file mode 100644 index 0000000..e644446 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/LimestoneMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/LimestoneSand.png b/src/main/resources/assets/textures/blocks/LimestoneSand.png new file mode 100644 index 0000000..2dec5bd Binary files /dev/null and b/src/main/resources/assets/textures/blocks/LimestoneSand.png differ diff --git a/src/main/resources/assets/textures/blocks/MarbleCracked.png b/src/main/resources/assets/textures/blocks/MarbleCracked.png new file mode 100644 index 0000000..b1bd018 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/MarbleCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/MarbleGravel.png b/src/main/resources/assets/textures/blocks/MarbleGravel.png new file mode 100644 index 0000000..5ef8d57 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/MarbleGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/MarbleMonolith.png b/src/main/resources/assets/textures/blocks/MarbleMonolith.png new file mode 100644 index 0000000..dc666dc Binary files /dev/null and b/src/main/resources/assets/textures/blocks/MarbleMonolith.png differ diff --git a/src/main/resources/assets/textures/blocks/MarbleSand.png b/src/main/resources/assets/textures/blocks/MarbleSand.png new file mode 100644 index 0000000..a2738e3 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/MarbleSand.png differ diff --git a/src/main/resources/assets/textures/blocks/RedGraniteCracked.png b/src/main/resources/assets/textures/blocks/RedGraniteCracked.png new file mode 100644 index 0000000..2d4cb78 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/RedGraniteCracked.png differ diff --git a/src/main/resources/assets/textures/blocks/RedGraniteGravel.png b/src/main/resources/assets/textures/blocks/RedGraniteGravel.png new file mode 100644 index 0000000..077b14e Binary files /dev/null and b/src/main/resources/assets/textures/blocks/RedGraniteGravel.png differ diff --git a/src/main/resources/assets/textures/blocks/GraniteMonolith.png b/src/main/resources/assets/textures/blocks/RedGraniteMonolith.png similarity index 100% rename from src/main/resources/assets/textures/blocks/GraniteMonolith.png rename to src/main/resources/assets/textures/blocks/RedGraniteMonolith.png diff --git a/src/main/resources/assets/textures/blocks/RedGraniteSand.png b/src/main/resources/assets/textures/blocks/RedGraniteSand.png new file mode 100644 index 0000000..28abf60 Binary files /dev/null and b/src/main/resources/assets/textures/blocks/RedGraniteSand.png differ