From 77276f33cb000bbbe1b61430401367fcb7369c0c Mon Sep 17 00:00:00 2001 From: sisyphussy Date: Sun, 14 Dec 2025 04:09:53 +0100 Subject: [PATCH 1/4] replace inventory render events --- dependencies.gradle | 16 ++++++++-------- .../avaritia/render/FracturedOreRenderer.java | 4 +++- .../avaritia/render/LudicrousRenderEvents.java | 11 ----------- .../avaritia/render/ModelArmorInfinity.java | 8 +++++--- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4429ce2..2b6e5a9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,22 +1,22 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GTNHLib:0.8.25:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.31-GTNH:dev") + api("com.github.GTNewHorizons:GTNHLib:0.8.32:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev") compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.2:api") {transitive = false} - compileOnly("com.github.GTNewHorizons:Botania:1.13.4-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:Botania:1.13.6-GTNH:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Mantle:0.5.1:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.6-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.5") {transitive = false} + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.15-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.7") {transitive = false} compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.11:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.97:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.25:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.140:dev") {transitive = false} compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false} compileOnly("curse.maven:cofh-lib-220333:2388748") {transitive = false} compileOnly("curse.maven:cofh-core-69162:2388751") {transitive = false} compileOnly("curse.maven:witchery-69673:2234410") {transitive = false} - runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.7.7:dev") + runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.8.32:dev") } diff --git a/src/main/java/fox/spiteful/avaritia/render/FracturedOreRenderer.java b/src/main/java/fox/spiteful/avaritia/render/FracturedOreRenderer.java index 442724f..ebe28de 100644 --- a/src/main/java/fox/spiteful/avaritia/render/FracturedOreRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/FracturedOreRenderer.java @@ -17,6 +17,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.shaders.UniversiumShader; + import fox.spiteful.avaritia.items.ItemFracturedOre; import fox.spiteful.avaritia.items.ItemFracturedOre.NameStack; @@ -265,7 +267,7 @@ public class FracturedOreRenderer implements IItemRenderer { GL11.glDisable(GL11.GL_BLEND); - if (!CosmicRenderShenanigans.inventoryRender) { + if (!UniversiumShader.isRenderingInInventory()) { mc.entityRenderer.enableLightmap(0.0); GL11.glEnable(GL11.GL_LIGHTING); } diff --git a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java index 1082d90..9a8905a 100644 --- a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java +++ b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java @@ -1,6 +1,5 @@ package fox.spiteful.avaritia.render; -import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.client.event.TextureStitchEvent; import org.lwjgl.opengl.GL11; @@ -33,14 +32,4 @@ public class LudicrousRenderEvents { ModelArmorInfinity.armorModel.rebuildOverlay(); ModelArmorInfinity.legModel.rebuildOverlay(); } - - @SubscribeEvent - public void makeCosmicStuffLessDumbInGUIs(GuiScreenEvent.DrawScreenEvent.Pre event) { - CosmicRenderShenanigans.inventoryRender = true; - } - - @SubscribeEvent - public void finishMakingCosmicStuffLessDumbInGUIs(GuiScreenEvent.DrawScreenEvent.Post event) { - CosmicRenderShenanigans.inventoryRender = false; - } } diff --git a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java index 0547422..e294789 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java @@ -20,6 +20,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.shaders.UniversiumShader; + import fox.spiteful.avaritia.items.ItemArmorInfinity; import fox.spiteful.avaritia.items.LudicrousItems; @@ -175,14 +177,14 @@ public class ModelArmorInfinity extends ModelBiped { super.render(entity, f, f1, f2, f3, f4, f5); } - if (!CosmicRenderShenanigans.inventoryRender) { + if (!UniversiumShader.isRenderingInInventory()) { mc.entityRenderer.enableLightmap(15.0); } GL11.glEnable(GL11.GL_LIGHTING); GL11.glColor4d(1, 1, 1, 1); // WINGS - if (isFlying && !CosmicRenderShenanigans.inventoryRender) { + if (isFlying && !UniversiumShader.isRenderingInInventory()) { this.setWings(); mc.renderEngine.bindTexture(wingTex); super.render(entity, f, f1, f2, f3, f4, f5); @@ -209,7 +211,7 @@ public class ModelArmorInfinity extends ModelBiped { GL11.glDepthMask(true); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); - if (!CosmicRenderShenanigans.inventoryRender) { + if (!UniversiumShader.isRenderingInInventory()) { mc.entityRenderer.enableLightmap(0.0); } GL11.glEnable(GL11.GL_LIGHTING); From 6650ba684d78b34193b2855571fd5b268dbfcfe1 Mon Sep 17 00:00:00 2001 From: sisyphussy Date: Wed, 17 Dec 2025 13:56:41 +0100 Subject: [PATCH 2/4] forgor to push --- dependencies.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2b6e5a9..ca7062f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -17,6 +17,4 @@ dependencies { compileOnly("curse.maven:cofh-lib-220333:2388748") {transitive = false} compileOnly("curse.maven:cofh-core-69162:2388751") {transitive = false} compileOnly("curse.maven:witchery-69673:2234410") {transitive = false} - - runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.8.32:dev") } From 279fccc2016415efe739e38f416be338415529b8 Mon Sep 17 00:00:00 2001 From: sisyphussy Date: Wed, 17 Dec 2025 14:01:18 +0100 Subject: [PATCH 3/4] merge entity case --- .../avaritia/render/CosmicItemRenderer.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java index fa51b86..c2cd0ae 100644 --- a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java @@ -39,7 +39,6 @@ public class CosmicItemRenderer implements IItemRenderer { if (item.isOnItemFrame()) GL11.glTranslatef(0F, -0.3F, 0.01F); render(item, null); GL11.glPopMatrix(); - break; } case EQUIPPED, EQUIPPED_FIRST_PERSON: { @@ -177,18 +176,7 @@ public class CosmicItemRenderer implements IItemRenderer { public void processLightLevel(ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: { - EntityItem ent = (EntityItem) (data[1]); - if (ent != null) { - CosmicRenderShenanigans.setLightFromLocation( - ent.worldObj, - MathHelper.floor_double(ent.posX), - MathHelper.floor_double(ent.posY), - MathHelper.floor_double(ent.posZ)); - } - break; - } - case EQUIPPED, EQUIPPED_FIRST_PERSON: { + case ENTITY, EQUIPPED, EQUIPPED_FIRST_PERSON: { EntityLivingBase ent = (EntityLivingBase) (data[1]); if (ent != null) { CosmicRenderShenanigans.setLightFromLocation( From 55c2a7aedefc5d2b45d9f00459dcb7bc4768df87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:06:01 +0100 Subject: [PATCH 4/4] Spotless apply for branch replace-universium for #67 (#68) Co-authored-by: GitHub GTNH Actions <> --- .../java/fox/spiteful/avaritia/render/CosmicItemRenderer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java index c2cd0ae..805b03b 100644 --- a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon;