Merge pull request #54 from Kotatsu-RTM/issue/42

モデルごとにアイテムのテクスチャを変更できるようにする

Author: Siro256

.patching-mods/main.yaml

@@ -139,6 +139,7 @@ mods:
       - jp.ngt.rtm.modelpack.ModelPackManager
       - jp.ngt.rtm.modelpack.RTMResourceManager
       - jp.ngt.rtm.modelpack.cfg.ResourceConfig
+      - jp.ngt.rtm.modelpack.cfg.RRSConfig
       - jp.ngt.rtm.modelpack.cfg.TrainConfig
       - jp.ngt.rtm.modelpack.cfg.VehicleBaseConfig
       - jp.ngt.rtm.modelpack.modelset.ModelSetBase

src/main/java/com/anatawa12/fixRtm/FixRtm.kt

@@ -10,6 +10,8 @@ import com.anatawa12.fixRtm.crash.RTMAllModelPackInfoCrashCallable
 import com.anatawa12.fixRtm.crash.RTMSmallModelPackInfoCrashCallable
 import com.anatawa12.fixRtm.gui.GuiHandler
 import com.anatawa12.fixRtm.io.FIXFileLoader
+import com.anatawa12.fixRtm.item.OverrideTextureModel
+import com.anatawa12.fixRtm.item.OverrideTextureItemStackRenderer
 import com.anatawa12.fixRtm.network.NetworkHandler
 import com.anatawa12.fixRtm.ngtlib.util.VersionChecker
 import com.anatawa12.fixRtm.rtm.modelpack.init.ClientModelPackLoader
@@ -21,9 +23,12 @@ import com.anatawa12.fixRtm.utils.ThreadLocalProperties
 import jp.ngt.ngtlib.NGTCore
 import jp.ngt.rtm.RTMCore
 import jp.ngt.rtm.RTMItem
+import jp.ngt.rtm.entity.vehicle.VehicleType
+import jp.ngt.rtm.item.ItemInstalledObject
 import jp.ngt.rtm.rail.TileEntityLargeRailBase
 import net.minecraft.block.Block
 import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.block.model.ModelResourceLocation
 import net.minecraft.client.resources.IReloadableResourceManager
 import net.minecraft.crash.CrashReport
 import net.minecraft.entity.player.EntityPlayerMP
@@ -34,6 +39,7 @@ import net.minecraft.util.ResourceLocation
 import net.minecraft.util.text.Style
 import net.minecraft.util.text.TextComponentString
 import net.minecraft.util.text.TextFormatting
+import net.minecraftforge.client.event.ModelBakeEvent
 import net.minecraftforge.client.event.ModelRegistryEvent
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.event.RegistryEvent
@@ -129,6 +135,18 @@ object FixRtm {
             SoundSystemConfig.setNumberNormalChannels(1024)
             SoundSystemConfig.setNumberStreamingChannels(32)
         }
+
+        if (e.side == Side.CLIENT) {
+            arrayOf(
+                RTMItem.installedObject,
+                RTMItem.itemVehicle,
+                RTMItem.itemtrain,
+                RTMItem.itemMotorman,
+                RTMItem.itemCargo,
+                RTMItem.itemLargeRail,
+                RTMItem.itemWire,
+            ).forEach { it.tileEntityItemStackRenderer = OverrideTextureItemStackRenderer }
+        }
     }
 
     private val thrownMarker = CrashReport("", Throwable())
@@ -174,6 +192,39 @@ object FixRtm {
         DummyModelObject.init()
     }
 
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    fun onModelBake(event: ModelBakeEvent) {
+        if (!MainConfig.useCustomIconTexture) return
+
+        val overrideModels: Array<ModelResourceLocation> = arrayOf(
+            *ItemInstalledObject.IstlObjType.entries
+                .filter { it.id >= 0 }
+                .filter { it != ItemInstalledObject.IstlObjType.RAILLOAD_SIGN || MainConfig.rrsImageAsIcon }
+                .map { ModelResourceLocation("rtm:istl_obj_${it.id}", "inventory") }
+                .toTypedArray(),
+            *VehicleType.entries
+                .map { ModelResourceLocation("rtm:vehicle_${it.id}}", "inventory") }
+                .toTypedArray(),
+            ModelResourceLocation("rtm:item_train_0", "inventory"),
+            ModelResourceLocation("rtm:item_train_1", "inventory"),
+            ModelResourceLocation("rtm:item_train_2", "inventory"),
+            ModelResourceLocation("rtm:item_train_3", "inventory"),
+            ModelResourceLocation("rtm:item_train_fixrtm_test", "inventory"),
+            ModelResourceLocation("rtm:item_npc_1", "inventory"),
+            ModelResourceLocation("rtm:cargo_0", "inventory"),
+            ModelResourceLocation("rtm:cargo_1", "inventory"),
+            ModelResourceLocation("rtm:item_large_rail", "inventory"),
+            ModelResourceLocation("rtm:item_wire", "inventory"),
+        )
+
+        overrideModels.forEach {
+            val baseModel = event.modelManager.getModel(it)
+            val customRendererModel = OverrideTextureModel(baseModel)
+            event.modelRegistry.putObject(it, customRendererModel)
+        }
+    }
+
     fun registerGenerators() {
         Minecraft.getMinecraft().defaultResourcePacks.add(GeneratedResourcePack)
         Minecraft.getMinecraft().resourceManager

src/main/java/com/anatawa12/fixRtm/asm/config/MainConfig.kt

@@ -15,6 +15,7 @@ object MainConfig {
     private const val categoryFixRTM = "fixrtm"
     private const val categoryModelLoading = "model_loading"
     private const val categoryBetterRtm = "better_rtm"
+    private const val CATEGORY_CUSTOM_ITEM_ICON = "$categoryBetterRtm.custom_item_icon"
     private const val categoryBetterNgtLib = "better_ngtlib"
 
     val modelPackLoadSpeed: ModelPackLoadSpeed
@@ -104,6 +105,23 @@ object MainConfig {
         """.trimIndent()
     )
 
+    val useCustomIconTexture = config.getBoolean(
+        "useCustomIconTexture", CATEGORY_CUSTOM_ITEM_ICON,
+        true,
+        """
+            Allow to use item icons per model in model pack.
+            Ported from KaizPatchX.
+        """.trimIndent()
+    )
+
+    val rrsImageAsIcon = config.getBoolean(
+        "rrsImageAsIcon", CATEGORY_CUSTOM_ITEM_ICON,
+        true,
+        """
+            Use images of railroad signs as item icons.
+        """.trimIndent()
+    )
+
     val expandPlayableSoundCount = config.getBoolean(
         "expandPlayableSoundCount", categoryFixRTM,
         true,

src/main/java/com/anatawa12/fixRtm/item/OverrideTextureItemStackRenderer.kt

@@ -0,0 +1,94 @@
+package com.anatawa12.fixRtm.item
+
+import com.anatawa12.fixRtm.asm.config.MainConfig
+import jp.ngt.rtm.RTMItem
+import jp.ngt.rtm.item.ItemInstalledObject
+import jp.ngt.rtm.item.ItemWithModel
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.GLAllocation
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraft.client.renderer.RenderHelper
+import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
+import net.minecraft.item.ItemStack
+import net.minecraft.util.ResourceLocation
+import org.lwjgl.opengl.GL11
+import org.lwjgl.opengl.GL12
+import org.lwjgl.opengl.GL13
+
+object OverrideTextureItemStackRenderer : TileEntityItemStackRenderer() {
+    private val COLOR = floatArrayOf(0.8f, 0.8f, 0.8f)
+    private const val FRONT_Z = 0.5f + 1.0f / 32.0f
+    private const val BACK_Z = 0.5f - 1.0f / 32.0f
+    private val VERTICES = floatArrayOf(
+        0.0f, 1.0f, 0.0f, 0.0f, FRONT_Z,
+        1.0f, 1.0f, 1.0f, 0.0f, FRONT_Z,
+        0.0f, 0.0f, 0.0f, 1.0f, FRONT_Z,
+        1.0f, 0.0f, 1.0f, 1.0f, FRONT_Z,
+        1.0f, 0.0f, 1.0f, 1.0f, BACK_Z,
+        1.0f, 1.0f, 1.0f, 0.0f, BACK_Z,
+        0.0f, 1.0f, 0.0f, 0.0f, BACK_Z,
+        0.0f, 0.0f, 0.0f, 1.0f, BACK_Z,
+    )
+    private val INDICES = intArrayOf(0, 1, 2, 3, 4, 1, 5, 0, 6, 2, 7, 4, 6, 5)
+
+    private val DISPLAY_LIST by lazy {
+        val id = GLAllocation.generateDisplayLists(1)
+
+        GL11.glNewList(id, GL11.GL_COMPILE)
+
+        GlStateManager.pushAttrib()
+        RenderHelper.disableStandardItemLighting()
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL12.GL_CLAMP_TO_EDGE)
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE)
+        GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL11.GL_DECAL)
+
+        GL11.glBegin(GL11.GL_TRIANGLE_STRIP)
+        for (i in INDICES) {
+            var j = 5 * i
+            GL11.glColor3f(COLOR[0], COLOR[1], COLOR[2])
+            GL11.glTexCoord2f(VERTICES[j++], VERTICES[j++])
+            GL11.glVertex3f(VERTICES[j++], VERTICES[j++], VERTICES[j])
+        }
+        GL11.glEnd()
+
+        GlStateManager.popAttrib()
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT)
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT)
+        GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL13.GL_COMBINE)
+
+        GL11.glEndList()
+
+        id
+    }
+
+    override fun renderByItem(itemStack: ItemStack, partialTick: Float) {
+        val renderItem = Minecraft.getMinecraft().renderItem
+
+        val model = renderItem.getItemModelWithOverrides(itemStack, null, null)
+        if (model !is OverrideTextureModel) {
+            renderItem.renderItem(itemStack, model)
+            return
+        }
+
+        val customTexture = getCustomIcon(itemStack)
+        val isRRS = itemStack.item == RTMItem.installedObject
+                && itemStack.itemDamage == ItemInstalledObject.IstlObjType.RAILLOAD_SIGN.id.toInt()
+        if (customTexture == null || (isRRS && !MainConfig.rrsImageAsIcon)) {
+            GL11.glTranslatef(0.5f, 0.5f, 0.5f)
+            renderItem.renderItem(itemStack, model.baseModel)
+            return
+        }
+
+        Minecraft.getMinecraft().textureManager.bindTexture(customTexture)
+        GL11.glCallList(DISPLAY_LIST)
+    }
+
+    private fun getCustomIcon(itemStack: ItemStack): ResourceLocation? {
+        val item = itemStack.item
+        if (item !is ItemWithModel<*>) {
+            return null
+        }
+        val resourceState = item.getModelState(itemStack) ?: return null
+        return resourceState.resourceSet.config.customIcon
+    }
+}

src/main/java/com/anatawa12/fixRtm/item/OverrideTextureModel.kt

@@ -0,0 +1,31 @@
+package com.anatawa12.fixRtm.item
+
+import net.minecraft.block.state.IBlockState
+import net.minecraft.client.renderer.block.model.BakedQuad
+import net.minecraft.client.renderer.block.model.IBakedModel
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms
+import net.minecraft.client.renderer.block.model.ItemOverrideList
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.EnumFacing
+import org.apache.commons.lang3.tuple.Pair
+import javax.vecmath.Matrix4f
+
+class OverrideTextureModel(val baseModel: IBakedModel) : IBakedModel {
+    override fun getQuads(state: IBlockState?, side: EnumFacing?, rand: Long): List<BakedQuad> =
+        baseModel.getQuads(state, side, rand)
+
+    override fun isAmbientOcclusion(): Boolean = baseModel.isAmbientOcclusion
+
+    override fun isGui3d(): Boolean = baseModel.isGui3d
+
+    override fun isBuiltInRenderer(): Boolean = true
+
+    override fun getParticleTexture(): TextureAtlasSprite = baseModel.particleTexture
+
+    override fun getOverrides(): ItemOverrideList = baseModel.overrides
+
+    override fun handlePerspective(transformType: ItemCameraTransforms.TransformType): Pair<out IBakedModel?, Matrix4f?> {
+        val matrix = baseModel.handlePerspective(transformType).right
+        return Pair.of(this, matrix)
+    }
+}

src/main/rtm-patches/jp/ngt/rtm/modelpack/cfg/RRSConfig.java.patch

@@ -0,0 +1,14 @@
+--- a/jp/ngt/rtm/modelpack/cfg/RRSConfig.java
++++ b/jp/ngt/rtm/modelpack/cfg/RRSConfig.java
+@@ -3,10 +3,11 @@
+ public class RRSConfig extends TextureConfig {
+    public void init() {
+       super.init();
+       this.width = 0.5F;
+       this.height = 0.5F;
++      customIconTexture = texture;
+    }
+ 
+    public RRSConfig(String name) {
+       this.texture = fixName(name);
+    }

src/main/rtm-patches/jp/ngt/rtm/modelpack/cfg/ResourceConfig.java.patch

@@ -1,6 +1,12 @@
 --- a/jp/ngt/rtm/modelpack/cfg/ResourceConfig.java
 +++ b/jp/ngt/rtm/modelpack/cfg/ResourceConfig.java
-@@ -5,14 +5,17 @@
+@@ -1,18 +1,25 @@
+ package jp.ngt.rtm.modelpack.cfg;
+ 
+ import jp.ngt.rtm.modelpack.state.DataMap;
++import net.minecraft.util.ResourceLocation;
++import org.jetbrains.annotations.Nullable;
+ 
  public abstract class ResourceConfig {
     public short version;
     public boolean useCustomColor;
@@ -12,17 +18,25 @@
     public String defaultData;
 
 +   public boolean synchronousLoading;
++   @Nullable
++   protected String customIconTexture;
 +
     public abstract String getName();
 
     public void init() {
        if (this.defaultValues == null && this.defaultData != null) {
           String[][] astring = DataMap.convertArg(this.defaultData);
-@@ -28,14 +31,18 @@
+@@ -27,15 +34,24 @@
+          }
        }
 
     }
 
++   @Nullable
++   public ResourceLocation getCustomIcon() {
++      return customIconTexture != null ? new ResourceLocation(customIconTexture) : null;
++   }
++
     protected String fixSoundPath(String path) {
 +      return fixSoundPath(path, null);
 +   }