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

Fix polymer support in 1.21.4

Browse Source 
You can now enjoy This Rocks on vanilla clients again :)
This commit is contained in:
Martin Prokoph
2025-01-11 20:21:57 +01:00
parent 663e85e9a8
commit dd028ccc8f
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStickModel.java
View File

@@ -23,9 +23,9 @@ public class ItemDisplayStickModel extends ConditionalBlockModel {
public static void initModels() { public static void initModels() {
for (StickType type : StickType.values()) { for (StickType type : StickType.values()) {
var stacks = new ItemStack[3]; var stacks = new ItemStack[3];
stacks[0] = ItemDisplayElementUtil.getModel(RocksMain.id("block/small_"+type.name()+"_stick")); for (int i = 0; i < 3; i++) {
stacks[1] = ItemDisplayElementUtil.getModel(RocksMain.id("block/medium_"+type.name()+"_stick")); stacks[i] = ItemDisplayElementUtil.getModel(RocksMain.id("block/"+type.getVariations()[i].getPath()));
stacks[2] = ItemDisplayElementUtil.getModel(RocksMain.id("block/large_"+type.name()+"_stick")); }
models.put(type, stacks); models.put(type, stacks);
} }
} }

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

@@ -30,7 +30,7 @@ public class StarfishItemPolymer extends BlockItem implements PolymerItem {
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()) {
StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION); StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION);
if (variation != null) return ResourcePackExtras.bridgeModel(polymerId(variation + "_starfish")); if (variation != null) return ResourcePackExtras.bridgeModel(polymerId("item/"+variation + "_starfish"));
} }
return itemStack.get(DataComponentTypes.ITEM_MODEL); return itemStack.get(DataComponentTypes.ITEM_MODEL);
} }

8
src/main/java/eu/midnightdust/motschen/rocks/util/RockType.java
View File

@@ -37,10 +37,10 @@ public enum RockType {
public Identifier[] getVariations() { public Identifier[] getVariations() {
var variations = new Identifier[4]; var variations = new Identifier[4];
variations[0] = id("tiny_"+name); variations[0] = id(name+"_tiny");
variations[1] = id("small_"+name); variations[1] = id(name+"_small");
variations[2] = id("medium_"+name); variations[2] = id(name+"_medium");
variations[3] = id("large_"+name); variations[3] = id(name+"_large");
return variations; return variations;
} }

16
src/main/java/eu/midnightdust/motschen/rocks/util/StickType.java
View File

@@ -5,6 +5,7 @@ import net.minecraft.block.Blocks;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects;
import static eu.midnightdust.motschen.rocks.RocksMain.id; import static eu.midnightdust.motschen.rocks.RocksMain.id;
@@ -32,18 +33,15 @@ public enum StickType {
public Identifier[] getVariations() { public Identifier[] getVariations() {
var variations = new Identifier[3]; var variations = new Identifier[3];
variations[0] = id("small_"+name); variations[0] = id(name+"_stick_small");
variations[1] = id("medium_"+name); variations[1] = id(name+"_stick_medium");
variations[2] = id("large_"+name); variations[2] = id(name+"_stick_large");
return variations; return variations;
} }
public static StickType fromBlockName(String name) { public static StickType fromBlockName(String name) {
return Arrays.stream(values()).filter(type -> name return Arrays.stream(StickType.values()).filter(woodType -> Objects.equals(woodType.getName(), name
.replace("block.rocks.", "") .replace("block.rocks.", "").replace("_stick", "")
.replace("small_", "") )).findFirst().orElse(StickType.OAK);
.replace("medium_", "")
.replace("large_", "")
.equals(type.getName())).findFirst().orElse(StickType.OAK);
} }
} }

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

@@ -17,6 +17,7 @@ import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils;
import eu.pb4.polymer.core.api.item.SimplePolymerItem; import eu.pb4.polymer.core.api.item.SimplePolymerItem;
import eu.pb4.polymer.core.api.utils.PolymerSyncUtils; import eu.pb4.polymer.core.api.utils.PolymerSyncUtils;
import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
import eu.pb4.polymer.resourcepack.extras.api.ResourcePackExtras;
import eu.pb4.polymer.virtualentity.api.ElementHolder; import eu.pb4.polymer.virtualentity.api.ElementHolder;
import eu.pb4.polymer.virtualentity.api.attachment.BlockBoundAttachment; import eu.pb4.polymer.virtualentity.api.attachment.BlockBoundAttachment;
import eu.pb4.polymer.virtualentity.impl.HolderHolder; import eu.pb4.polymer.virtualentity.impl.HolderHolder;
@@ -51,6 +52,9 @@ public class PolyUtil {
if (PASSABLE_WATERLOGGED_BLOCK == null) SMALL_BLOCK = Blocks.BARRIER.getDefaultState().with(WATERLOGGED, true); if (PASSABLE_WATERLOGGED_BLOCK == null) SMALL_BLOCK = Blocks.BARRIER.getDefaultState().with(WATERLOGGED, true);
PolymerResourcePackUtils.addModAssets(MOD_ID); PolymerResourcePackUtils.addModAssets(MOD_ID);
ResourcePackExtras.forDefault().addBridgedModelsFolder(id("block"), id("rocks"));
ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("block"), polymerId("polymer-rocks"));
ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("item"), polymerId("polymer-rocks"));
ItemDisplayNetherGeyserModel.initModels(); ItemDisplayNetherGeyserModel.initModels();
ItemDisplayOverworldGeyserModel.initModels(); ItemDisplayOverworldGeyserModel.initModels();