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
This commit is contained in:
IvanZ 2021-08-21 17:44:01 +03:00 committed by OLEGSHA
parent 6f90bf345b
commit 4f620b7261
Signed by: OLEGSHA
GPG Key ID: E57A4B08D64AFF7A
32 changed files with 36 additions and 10 deletions

View File

@ -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<>();

View File

@ -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");

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB