Added 6 more types of rocks
- Added black granite, dolomite, eclogite, gabbro, limestone and marble - Monolith, cracked, gravel and sand variants - Renamed Test:Granite to Test:RedGranite - Added red granite sand
@ -29,6 +29,8 @@ import java.util.Set;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
|
||||||
import glm.vec._3.i.Vec3i;
|
import glm.vec._3.i.Vec3i;
|
||||||
import ru.windcorp.progressia.client.ClientState;
|
import ru.windcorp.progressia.client.ClientState;
|
||||||
import ru.windcorp.progressia.client.audio.Sound;
|
import ru.windcorp.progressia.client.audio.Sound;
|
||||||
@ -101,13 +103,7 @@ public class TestContent {
|
|||||||
register(new BlockRenderOpaqueCube("Test:Stone", getBlockTexture("Stone")));
|
register(new BlockRenderOpaqueCube("Test:Stone", getBlockTexture("Stone")));
|
||||||
register(new BlockLogic("Test:Stone"));
|
register(new BlockLogic("Test:Stone"));
|
||||||
|
|
||||||
for (String type : new String[] { "Monolith", "Cracked", "Gravel" }) {
|
registerRocks();
|
||||||
String id = "Test:Granite" + type;
|
|
||||||
|
|
||||||
register(new BlockData(id));
|
|
||||||
register(new BlockRenderOpaqueCube(id, getBlockTexture("Granite" + type)));
|
|
||||||
register(new BlockLogic(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
register(new BlockData("Test:Brick"));
|
register(new BlockData("Test:Brick"));
|
||||||
register(new BlockRenderOpaqueCube("Test:Brick", getBlockTexture("Brick")));
|
register(new BlockRenderOpaqueCube("Test:Brick", getBlockTexture("Brick")));
|
||||||
@ -153,6 +149,36 @@ public class TestContent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void registerRocks() {
|
||||||
|
List<String> rockNames = ImmutableList.of(
|
||||||
|
"BlackGranite",
|
||||||
|
"Dolomite",
|
||||||
|
"Eclogite",
|
||||||
|
"Gabbro",
|
||||||
|
"Limestone",
|
||||||
|
"Marble",
|
||||||
|
"RedGranite"
|
||||||
|
);
|
||||||
|
|
||||||
|
List<String> 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() {
|
private static void registerTiles() {
|
||||||
Set<String> placeableBlacklist = new HashSet<>();
|
Set<String> placeableBlacklist = new HashSet<>();
|
||||||
|
|
||||||
|
@ -68,9 +68,9 @@ public class TestGenerationConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void registerTerrainLayers(FloatRangeMap<TerrainLayer> layers) {
|
private static void registerTerrainLayers(FloatRangeMap<TerrainLayer> layers) {
|
||||||
BlockData granite = BlockDataRegistry.getInstance().get("Test:GraniteMonolith");
|
BlockData granite = BlockDataRegistry.getInstance().get("Test:RedGraniteMonolith");
|
||||||
BlockData graniteCracked = BlockDataRegistry.getInstance().get("Test:GraniteCracked");
|
BlockData graniteCracked = BlockDataRegistry.getInstance().get("Test:RedGraniteCracked");
|
||||||
BlockData graniteGravel = BlockDataRegistry.getInstance().get("Test:GraniteGravel");
|
BlockData graniteGravel = BlockDataRegistry.getInstance().get("Test:RedGraniteGravel");
|
||||||
|
|
||||||
BlockData dirt = BlockDataRegistry.getInstance().get("Test:Dirt");
|
BlockData dirt = BlockDataRegistry.getInstance().get("Test:Dirt");
|
||||||
BlockData air = BlockDataRegistry.getInstance().get("Test:Air");
|
BlockData air = BlockDataRegistry.getInstance().get("Test:Air");
|
||||||
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/main/resources/assets/textures/blocks/BlackGraniteGravel.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 1.9 KiB |
BIN
src/main/resources/assets/textures/blocks/BlackGraniteSand.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/DolomiteCracked.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
src/main/resources/assets/textures/blocks/DolomiteGravel.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/DolomiteMonolith.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
src/main/resources/assets/textures/blocks/DolomiteSand.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/EclogiteCracked.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/EclogiteGravel.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/EclogiteMonolith.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
src/main/resources/assets/textures/blocks/EclogiteSand.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/GabbroCracked.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/GabbroGravel.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
src/main/resources/assets/textures/blocks/GabbroMonolith.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/GabbroSand.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 8.7 KiB |
BIN
src/main/resources/assets/textures/blocks/LimestoneCracked.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
src/main/resources/assets/textures/blocks/LimestoneGravel.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
src/main/resources/assets/textures/blocks/LimestoneMonolith.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
src/main/resources/assets/textures/blocks/LimestoneSand.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
src/main/resources/assets/textures/blocks/MarbleCracked.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
src/main/resources/assets/textures/blocks/MarbleGravel.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
src/main/resources/assets/textures/blocks/MarbleMonolith.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
src/main/resources/assets/textures/blocks/MarbleSand.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/assets/textures/blocks/RedGraniteCracked.png
Normal file
After Width: | Height: | Size: 7.8 KiB |
BIN
src/main/resources/assets/textures/blocks/RedGraniteGravel.png
Normal file
After Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
BIN
src/main/resources/assets/textures/blocks/RedGraniteSand.png
Normal file
After Width: | Height: | Size: 9.8 KiB |