Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-11-19 22:40:18 +01:00
Code Issues Projekte Releases Wiki Aktivität

Use block states more efficiently for custom skulls

Quellcode durchsuchen 
21 block states vs 48 block states
Dieser Commit ist enthalten in:
davchoo 2022-07-09 21:05:22 -04:00
Ursprung d07a06cd3b
Commit 08c24cb462
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A0168C8E45799B7D
1 geänderte Dateien mit 16 neuen und 14 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

30
core/src/main/java/org/geysermc/geyser/registry/type/CustomSkull.java
Datei anzeigen

@ -48,8 +48,8 @@ public class CustomSkull {
private CustomBlockData customBlockData; private CustomBlockData customBlockData;
private static final String DIRECTION_PROPERTY = "geyser_skull:direction"; private static final String BITS_A_PROPERTY = "geyser_skull:bits_a";
private static final String TYPE_PROPERTY = "geyser_skull:type"; private static final String BITS_B_PROPERTY = "geyser_skull:bits_b";
private static final int[] ROTATIONS = {0, -90, 180, 90}; private static final int[] ROTATIONS = {0, -90, 180, 90};
@ -70,16 +70,16 @@ public class CustomSkull {
customBlockData = new GeyserCustomBlockData.CustomBlockDataBuilder() customBlockData = new GeyserCustomBlockData.CustomBlockDataBuilder()
.name("player_skull_" + skinHash) .name("player_skull_" + skinHash)
.components(components) .components(components)
.intProperty(DIRECTION_PROPERTY, IntStream.rangeClosed(0, 15).boxed().toList()) .intProperty(BITS_A_PROPERTY, IntStream.rangeClosed(0, 6).boxed().toList()) // This gives us exactly 21 block states
.intProperty(TYPE_PROPERTY, IntStream.rangeClosed(0, 2).boxed().toList()) .intProperty(BITS_B_PROPERTY, IntStream.rangeClosed(0, 2).boxed().toList())
.permutations(permutations) .permutations(permutations)
.build(); .build();
} }
public CustomBlockState getDefaultBlockState() { public CustomBlockState getDefaultBlockState() {
return customBlockData.blockStateBuilder() return customBlockData.blockStateBuilder()
.intProperty(DIRECTION_PROPERTY, 0) .intProperty(BITS_A_PROPERTY, 0)
.intProperty(TYPE_PROPERTY, 0) .intProperty(BITS_B_PROPERTY, 0)
.build(); .build();
} }
@ -93,15 +93,15 @@ public class CustomSkull {
}; };
return customBlockData.blockStateBuilder() return customBlockData.blockStateBuilder()
.intProperty(DIRECTION_PROPERTY, wallDirection) .intProperty(BITS_A_PROPERTY, wallDirection + 1)
.intProperty(TYPE_PROPERTY, 1) .intProperty(BITS_B_PROPERTY, 0)
.build(); .build();
} }
public CustomBlockState getFloorBlockState(int floorRotation) { public CustomBlockState getFloorBlockState(int floorRotation) {
return customBlockData.blockStateBuilder() return customBlockData.blockStateBuilder()
.intProperty(DIRECTION_PROPERTY, floorRotation) .intProperty(BITS_A_PROPERTY, (5 + floorRotation) % 7)
.intProperty(TYPE_PROPERTY, 2) .intProperty(BITS_B_PROPERTY, (5 + floorRotation) / 7)
.build(); .build();
} }
@ -111,7 +111,7 @@ public class CustomSkull {
.rotation(new RotationComponent(0, 180, 0)) .rotation(new RotationComponent(0, 180, 0))
.build(); .build();
String condition = String.format("query.block_property('%s') == 0 && query.block_property('%s') == 0", DIRECTION_PROPERTY, TYPE_PROPERTY); String condition = String.format("query.block_property('%s') == 0 && query.block_property('%s') == 0", BITS_A_PROPERTY, BITS_B_PROPERTY);
permutations.add(new GeyserCustomBlockPermutation.CustomBlockPermutationBuilder() permutations.add(new GeyserCustomBlockPermutation.CustomBlockPermutationBuilder()
.condition(condition) .condition(condition)
.components(components) .components(components)
@ -129,7 +129,7 @@ public class CustomSkull {
for (int quadrant = 0; quadrant < 4; quadrant++) { for (int quadrant = 0; quadrant < 4; quadrant++) {
RotationComponent rotation = new RotationComponent(0, ROTATIONS[quadrant], 0); RotationComponent rotation = new RotationComponent(0, ROTATIONS[quadrant], 0);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int floorDirection = 4 * quadrant + i; int floorRotation = 4 * quadrant + i;
CustomBlockComponents components = new GeyserCustomBlockComponents.CustomBlockComponentsBuilder() CustomBlockComponents components = new GeyserCustomBlockComponents.CustomBlockComponentsBuilder()
.aimCollision(box) .aimCollision(box)
.entityCollision(box) .entityCollision(box)
@ -137,7 +137,9 @@ public class CustomSkull {
.rotation(rotation) .rotation(rotation)
.build(); .build();
String condition = String.format("query.block_property('%s') == %d && query.block_property('%s') == %d", DIRECTION_PROPERTY, floorDirection, TYPE_PROPERTY, 2); int bitsA = (5 + floorRotation) % 7;
int bitsB = (5 + floorRotation) / 7;
String condition = String.format("query.block_property('%s') == %d && query.block_property('%s') == %d", BITS_A_PROPERTY, bitsA, BITS_B_PROPERTY, bitsB);
permutations.add(new GeyserCustomBlockPermutation.CustomBlockPermutationBuilder() permutations.add(new GeyserCustomBlockPermutation.CustomBlockPermutationBuilder()
.condition(condition) .condition(condition)
.components(components) .components(components)
@ -154,7 +156,7 @@ public class CustomSkull {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
RotationComponent rotation = new RotationComponent(0, ROTATIONS[i], 0); RotationComponent rotation = new RotationComponent(0, ROTATIONS[i], 0);
String condition = String.format("query.block_property('%s') == %d && query.block_property('%s') == %d", DIRECTION_PROPERTY, i, TYPE_PROPERTY, 1); String condition = String.format("query.block_property('%s') == %d && query.block_property('%s') == %d", BITS_A_PROPERTY, i + 1, BITS_B_PROPERTY, 0);
CustomBlockComponents components = new GeyserCustomBlockComponents.CustomBlockComponentsBuilder() CustomBlockComponents components = new GeyserCustomBlockComponents.CustomBlockComponentsBuilder()
.aimCollision(box) .aimCollision(box)