Update Version Replacement (#5)

* Update version replacement

* Use CCRenderState instance

* Comment out MCFrames|API again
This commit is contained in:
glowredman authored and GitHub committed 2024-02-13 22:06:41 +01:00
1 parent 3529de5863
commit 6820516d89
9 files changed
+52 -32

No files matched your search

+2 -10
View File
@@ -12,11 +12,7 @@
"credits": "",
"logoFile": "",
"screenshots": [],
"parent": "",
"requiredMods": ["MrTJPCoreMod"],
"dependencies": [],
"dependants": [],
"useDependencyInformation": true
"parent": ""
},
{
"modid": "MCFrames",
@@ -30,10 +26,6 @@
"credits": "",
"logoFile": "fr_logo.png",
"screenshots": [],
"parent": "",
"requiredMods": ["${modId}"],
"dependencies": [],
"dependants": [],
"useDependencyInformation": true
"parent": ""
}]
}
@@ -2,5 +2,27 @@
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
*/
// @API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "GRADLETOKEN_VERSION")
// spotless:off
//
// You may wonder, "why is this commented out?"
// When FML sorts the modcontainers, it includes APIs. The API's dependency is always its owner but if an API is found
// embedded in a mod which isn't the owner, that mod is set as the API's dependant. In this case, the same jar contains
// both ForgeRelocation and MCFrames, each with an API. So when FML determins which APIs are embedded where, it sees
// MCFrames|API embedded in ForgeRelocation and ForgeRelocation|API embedded in MCFrames. This results in the following
// circular load order:
//
// MCFrames --------------> MCFrames|API <----+
// ^ ^ | |
// | | | |
// | +-------------------+ | +- MrTJPCore
// | | | |
// | | v |
// ForgeRelocation|API <--- ForgeRelocation <-+
//
// spotless:on
// @API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = Tags.VERSION)
package mrtjp.mcframes.api;
// import cpw.mods.fml.common.API;
// import mrtjp.relocation.Tags;
+11 -9
View File
@@ -190,9 +190,10 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
meta: Int
) {
TextureUtils.bindAtlas(0)
CCRenderState.reset()
CCRenderState.lightMatrix.locate(w, x, y, z)
CCRenderState.setBrightness(w, x, y, z)
val state = CCRenderState.instance
state.reset()
state.lightMatrix.locate(w, x, y, z)
state.setBrightness(w, x, y, z)
if (r.hasOverrideBlockTexture) {
getOrGenerateModel(0).render(
@@ -204,15 +205,16 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
def renderInvBlock(r: RenderBlocks, meta: Int) {
TextureUtils.bindAtlas(0)
CCRenderState.reset()
CCRenderState.setDynamic()
CCRenderState.pullLightmap()
val state = CCRenderState.instance
state.reset()
state.setDynamic()
state.pullLightmap()
CCRenderState.startDrawing()
state.startDrawing()
RenderFrame.render(new Vector3(-0.5, -0.5, -0.5), 0)
CCRenderState.render()
CCRenderState.draw()
state.render()
state.draw()
}
def registerIcons(reg: IIconRegister) {
@@ -14,6 +14,7 @@ import cpw.mods.fml.common.event.{
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
import mrtjp.mcframes.api.MCFramesAPI
import mrtjp.mcframes.{BlockFrame, BlockMotor, StickRegistry}
import mrtjp.relocation.Tags
import net.minecraft.client.gui.GuiScreen
@Mod(
@@ -31,7 +32,7 @@ object MCFramesMod {
final val modID = "MCFrames"
final val modName = "MCFrames"
final val version = "GRADLETOKEN_VERSION"
final val version = Tags.VERSION
var blockFrame: BlockFrame = _
var blockMotor: BlockMotor = _
@@ -2,7 +2,8 @@
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
*/
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "GRADLETOKEN_VERSION")
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = Tags.VERSION)
package mrtjp.relocation.api;
import cpw.mods.fml.common.API;
import mrtjp.relocation.Tags;
@@ -14,6 +14,7 @@ import cpw.mods.fml.common.event.{
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
import mrtjp.relocation.api._
import mrtjp.relocation.{BlockMovingRow, MovingTileRegistry}
import mrtjp.relocation.Tags
import net.minecraft.client.gui.GuiScreen
import org.apache.logging.log4j.LogManager
@@ -32,7 +33,7 @@ object RelocationMod {
final val modID = "ForgeRelocation"
final val modName = "ForgeRelocation"
final val version = "GRADLETOKEN_VERSION"
final val version = Tags.VERSION
val log = LogManager.getFormatterLogger(modID)