Motschen/ThisRocks
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/ThisRocks.git synced 2025-12-16 10:55:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prettify code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java
View File

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

14
src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java
View File

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

3
src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java
View File

@@ -76,7 +76,8 @@ public class PolyUtil {
} }
public static void registerPolymerGroup() { 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); PolymerItemGroupUtils.registerPolymerItemGroup(id("rocks"), RocksMain.RocksGroup);
} }