Merge remote-tracking branch 'origin/replace-universium' into dev

This commit is contained in:
Martin Robertz committed 2025-12-20 12:25:38 +01:00
commit 17e9cc9bba
5 files changed
+16 -38

No files matched your search

+7 -9
View File
@@ -1,22 +1,20 @@
// 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")
}
@@ -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;
@@ -39,7 +38,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 +175,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(
@@ -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);
}
@@ -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;
}
}
@@ -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);