Prettify code

This commit is contained in:
Martin Prokoph
2024-12-30 12:02:17 +01:00
parent 34ae7e922b
commit 3e3cd25b67
3 changed files with 11 additions and 13 deletions

View File

@@ -18,9 +18,10 @@ public class RocksClient implements ClientModInitializer {
public void onInitializeClient() {
ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> sender.sendPacket(new HelloPayload()));
ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of("red"), (stack, world, entity, seed) -> matchesVariation(stack, StarfishVariation.RED));
ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of("pink"), (stack, world, entity, seed) -> matchesVariation(stack, StarfishVariation.PINK));
ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of("orange"), (stack, world, entity, seed) -> matchesVariation(stack, StarfishVariation.ORANGE));
for (StarfishVariation variation : StarfishVariation.values()) {
ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of(variation.toString()),
(stack, world, entity, seed) -> matchesVariation(stack, variation));
}
}
private static Integer matchesVariation(ItemStack stack, StarfishVariation variation) {
var blockStateData = stack.getComponents().get(DataComponentTypes.BLOCK_STATE);

View File

@@ -34,12 +34,8 @@ public class StarfishItemPolymer extends BlockItem implements AutoModeledPolymer
public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
var state = itemStack.getComponents().get(DataComponentTypes.BLOCK_STATE);
if (state != null && !state.isEmpty()) {
return switch (state.getValue(RocksMain.STARFISH_VARIATION)) {
case RED -> MODELS.get(StarfishVariation.RED).value();
case PINK -> MODELS.get(StarfishVariation.PINK).value();
case ORANGE -> MODELS.get(StarfishVariation.ORANGE).value();
case null -> MODELS.get(this).value();
};
StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION);
if (variation != null) return MODELS.get(variation).value();
}
return MODELS.get(this).value();
}
@@ -48,9 +44,9 @@ public class StarfishItemPolymer extends BlockItem implements AutoModeledPolymer
public void onRegistered(Identifier selfId) {
var item = Identifier.of(selfId.getNamespace(), "item/" + selfId.getPath());
MODELS.put(this, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), item));
MODELS.put(StarfishVariation.RED, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), polymerId("item/" + "red_" + selfId.getPath())));
MODELS.put(StarfishVariation.PINK, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), polymerId("item/" + "pink_" + selfId.getPath())));
MODELS.put(StarfishVariation.ORANGE, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), polymerId("item/" + "orange_" + selfId.getPath())));
for (StarfishVariation variation : StarfishVariation.values()) {
MODELS.put(variation, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), polymerId("item/" + variation.toString() + "_" + selfId.getPath())));
}
}
@Override

View File

@@ -76,7 +76,8 @@ public class PolyUtil {
}
public static void registerPolymerGroup() {
RocksMain.RocksGroup = PolymerItemGroupUtils.builder().displayName(Text.translatable("itemGroup.rocks.rocks")).icon(() -> new ItemStack(rocksByType.get(RockType.STONE))).entries((displayContext, entries) -> entries.addAll(RocksMain.groupItems)).build();
RocksMain.RocksGroup = PolymerItemGroupUtils.builder().displayName(Text.translatable("itemGroup.rocks.rocks")).icon(() ->
new ItemStack(rocksByType.get(RockType.STONE))).entries((displayContext, entries) -> entries.addAll(RocksMain.groupItems)).build();
PolymerItemGroupUtils.registerPolymerItemGroup(id("rocks"), RocksMain.RocksGroup);
}