WoodType compat (#410)

* WoodType compat * moved StringRepresentable into IWoodType and more
ValkyrienSkies · Oct 29, 2024 · 42c5a56 · 42c5a56
1 parent 7caa63d
commit 42c5a56
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 24 deletions.
diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/block/IWoodType.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/block/IWoodType.kt
@@ -0,0 +1,11 @@
+package org.valkyrienskies.eureka.block
+
+import net.minecraft.util.StringRepresentable
+import net.minecraft.world.level.block.Block
+
+public interface IWoodType : StringRepresentable {
+
+    fun getWood(): Block
+
+    fun getPlanks(): Block
+}
diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/block/ShipHelmBlock.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/block/ShipHelmBlock.kt
@@ -34,7 +34,7 @@ import org.valkyrienskies.mod.common.ValkyrienSkiesMod
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.getShipObjectManagingPos
 
-class ShipHelmBlock(properties: Properties, val woodType: WoodType) : BaseEntityBlock(properties) {
+class ShipHelmBlock(properties: Properties, val woodType: IWoodType) : BaseEntityBlock(properties) {
     val HELM_BASE = RotShapes.box(2.0, 0.0, 2.0, 14.0, 2.0, 14.0)
     val HELM_POLE = RotShapes.box(4.0, 2.0, 5.0, 12.0, 13.0, 13.0)
 

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/block/WoodType.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/block/WoodType.kt
@@ -1,22 +1,21 @@
 package org.valkyrienskies.eureka.block
 
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.StringRepresentable
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.Blocks
 
-// TODO mod compat
+public enum class WoodType(final val logBlock: Block, final val plankBlock: Block) : IWoodType {
+    ACACIA(Blocks.ACACIA_LOG, Blocks.ACACIA_PLANKS),
+    BIRCH(Blocks.BIRCH_LOG, Blocks.BIRCH_PLANKS),
+    CRIMSON(Blocks.CRIMSON_STEM, Blocks.CRIMSON_PLANKS),
+    DARK_OAK(Blocks.DARK_OAK_LOG, Blocks.DARK_OAK_PLANKS),
+    JUNGLE(Blocks.JUNGLE_LOG, Blocks.JUNGLE_PLANKS),
+    OAK(Blocks.OAK_LOG, Blocks.OAK_PLANKS),
+    SPRUCE(Blocks.SPRUCE_LOG, Blocks.SPRUCE_PLANKS),
+    WARPED(Blocks.WARPED_STEM, Blocks.WARPED_PLANKS);
 
-enum class WoodType(val resourceName: String) : StringRepresentable {
-    OAK("oak"),
-    SPRUCE("spruce"),
-    BIRCH("birch"),
-    JUNGLE("jungle"),
-    ACACIA("acacia"),
-    DARK_OAK("dark_oak"),
-    WARPED("warped"),
-    CRIMSON("crimson");
+    override fun getSerializedName(): String = name.lowercase()
 
-    val textureLocationPlanks get() = ResourceLocation("minecraft:block/${resourceName}_planks")
-    val textureLocationLog get() = ResourceLocation("minecraft:block/${resourceName}_log")
+    override fun getWood(): Block = logBlock
 
-    override fun getSerializedName(): String = resourceName
+    override fun getPlanks(): Block = plankBlock
 }
diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/blockentity/renderer/WheelModel.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/blockentity/renderer/WheelModel.kt
@@ -9,6 +9,7 @@ import net.minecraft.client.resources.model.BakedModel
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.StateHolder
 import net.minecraft.world.level.block.state.properties.EnumProperty
+import org.valkyrienskies.eureka.block.IWoodType
 import org.valkyrienskies.eureka.block.ShipHelmBlock
 import org.valkyrienskies.eureka.block.WoodType
 import java.util.function.Function
@@ -53,14 +54,14 @@ object WheelModels {
         matrixStack.popPose()
     }
 
-    fun setModelGetter(getter: Function<WoodType, BakedModel>) {
+    fun setModelGetter(getter: Function<IWoodType, BakedModel>) {
         models.values.forEach { it.getter = getter::apply }
     }
 
     class WheelModel(type: WoodType) :
         StateHolder<WheelModels, WheelModel>(WheelModels, ImmutableMap.of(property, type), null) {
 
-        var getter: (WoodType) -> BakedModel = { throw IllegalStateException("Getter not set") }
+        var getter: (IWoodType) -> BakedModel = { throw IllegalStateException("Getter not set") }
 
         val model by lazy { getter(type) }
     }

diff --git a/fabric/src/main/java/org/valkyrienskies/eureka/fabric/EurekaModFabric.java b/fabric/src/main/java/org/valkyrienskies/eureka/fabric/EurekaModFabric.java
@@ -18,6 +18,7 @@
 import org.valkyrienskies.eureka.EurekaBlockEntities;
 import org.valkyrienskies.eureka.EurekaConfig;
 import org.valkyrienskies.eureka.EurekaMod;
+import org.valkyrienskies.eureka.block.IWoodType;
 import org.valkyrienskies.eureka.block.WoodType;
 import org.valkyrienskies.eureka.blockentity.renderer.ShipHelmBlockEntityRenderer;
 import org.valkyrienskies.eureka.blockentity.renderer.WheelModels;
@@ -54,10 +55,10 @@ public void onInitializeClient() {
             );
 
             ModelLoadingRegistry.INSTANCE.registerModelProvider((manager, out) -> {
-                for (final WoodType woodType : WoodType.getEntries()) {
+                for (final IWoodType woodType : WoodType.getEntries()) {
                     out.accept(new ResourceLocation(
                         EurekaMod.MOD_ID,
-                        "block/" + woodType.getResourceName() + "_ship_helm_wheel"
+                        "block/" + woodType.getSerializedName().toLowerCase() + "_ship_helm_wheel"
                     ));
                 }
             });
@@ -66,7 +67,7 @@ public void onInitializeClient() {
                 BakedModelManagerHelper.getModel(Minecraft.getInstance().getModelManager(),
                     new ResourceLocation(
                             EurekaMod.MOD_ID,
-                            "block/" + woodType.getResourceName() + "_ship_helm_wheel"
+                            "block/" + woodType.getSerializedName().toLowerCase() + "_ship_helm_wheel"
                     )));
         }
     }

diff --git a/forge/src/main/kotlin/org/valkyrienskies/eureka/forge/EurekaModForge.kt b/forge/src/main/kotlin/org/valkyrienskies/eureka/forge/EurekaModForge.kt
@@ -16,6 +16,7 @@ import org.valkyrienskies.eureka.EurekaConfig
 import org.valkyrienskies.eureka.EurekaMod
 import org.valkyrienskies.eureka.EurekaMod.init
 import org.valkyrienskies.eureka.EurekaMod.initClient
+import org.valkyrienskies.eureka.block.IWoodType
 import org.valkyrienskies.eureka.block.WoodType
 import org.valkyrienskies.eureka.blockentity.renderer.ShipHelmBlockEntityRenderer
 import org.valkyrienskies.eureka.blockentity.renderer.WheelModels.setModelGetter
@@ -65,13 +66,13 @@ class EurekaModForge {
         }
         happendClientSetup = true
         initClient()
-        setModelGetter { woodType: WoodType ->
+        setModelGetter { woodType: IWoodType ->
             ForgeModelBakery.instance()!!
                 .bakedTopLevelModels
                 .getOrDefault(
                     ResourceLocation(
                         EurekaMod.MOD_ID,
-                        "block/" + woodType.resourceName + "_ship_helm_wheel"
+                        "block/" + woodType.getSerializedName().lowercase() + "_ship_helm_wheel"
                     ),
                     Minecraft.getInstance().modelManager.missingModel
                 )
@@ -90,7 +91,7 @@ class EurekaModForge {
         for (woodType in WoodType.entries) {
             ForgeModelBakery.addSpecialModel(
                 ResourceLocation(
-                    EurekaMod.MOD_ID, "block/" + woodType.resourceName + "_ship_helm_wheel"
+                    EurekaMod.MOD_ID, "block/" + woodType.getSerializedName().lowercase() + "_ship_helm_wheel"
                 )
             )
         }