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

This commit is contained in:
Martin Robertz committed 2026-02-06 19:59:08 +01:00
commit 34d91edf40
32 files changed
+32 -954

No files matched your search

@@ -37,7 +37,6 @@ public class Avaritia {
@SidedProxy(serverSide = "fox.spiteful.avaritia.CommonProxy", clientSide = "fox.spiteful.avaritia.ClientProxy")
public static CommonProxy proxy;
public static final boolean isHodgepodgeLoaded = Loader.isModLoaded("hodgepodge");
public static final boolean isDreamCraftLoaded = Loader.isModLoaded("dreamcraft");
public static CreativeTabs tab = new CreativeTabs("avaritia") {
@@ -19,7 +19,6 @@ import fox.spiteful.avaritia.render.FracturedOreRenderer;
import fox.spiteful.avaritia.render.LudicrousRenderEvents;
import fox.spiteful.avaritia.render.RenderGapingVoid;
import fox.spiteful.avaritia.render.RenderHeavenArrow;
import fox.spiteful.avaritia.render.ShaderHelper;
public class ClientProxy extends CommonProxy {
@@ -67,8 +66,6 @@ public class ClientProxy extends CommonProxy {
LudicrousRenderEvents fancyevents = new LudicrousRenderEvents();
MinecraftForge.EVENT_BUS.register(fancyevents);
FMLCommonHandler.instance().bus().register(fancyevents);
ShaderHelper.initShaders();
}
@Override
@@ -5,8 +5,7 @@ import net.minecraft.client.renderer.ItemRenderer;
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.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -20,7 +19,6 @@ public class CosmicItemRenderer implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
// return type != ItemRenderType.INVENTORY;
return true;
}
@@ -33,7 +31,6 @@ public class CosmicItemRenderer implements IItemRenderer {
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
Minecraft mc = Minecraft.getMinecraft();
this.processLightLevel(type, item, data);
// ShaderHelper.useShader(ShaderHelper.testShader, this.shaderCallback);
switch (type) {
case ENTITY: {
GL11.glPushMatrix();
@@ -41,14 +38,9 @@ public class CosmicItemRenderer implements IItemRenderer {
if (item.isOnItemFrame()) GL11.glTranslatef(0F, -0.3F, 0.01F);
render(item, null);
GL11.glPopMatrix();
break;
}
case EQUIPPED: {
render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null);
break;
}
case EQUIPPED_FIRST_PERSON: {
case EQUIPPED, EQUIPPED_FIRST_PERSON: {
render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null);
break;
}
@@ -80,7 +72,7 @@ public class CosmicItemRenderer implements IItemRenderer {
IIcon cosmicicon = icri.getMaskTexture(item, null);
GL11.glColor4d(1, 1, 1, 1);
GL11.glColor4f(1, 1, 1, 1);
float minu = cosmicicon.getMinU();
float maxu = cosmicicon.getMaxU();
@@ -113,9 +105,6 @@ public class CosmicItemRenderer implements IItemRenderer {
default:
break;
}
// ShaderHelper.releaseShader();
// Lumberjack.log(Level.INFO, light+"");
}
public void render(ItemStack item, EntityPlayer player) {
@@ -128,22 +117,16 @@ public class CosmicItemRenderer implements IItemRenderer {
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(1F, 1F, 1F, 1F);
// ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(),
// scale);
float r, g, b;
IIcon icon;
float f, f1, f2, f3;
float scale = 1F / 16F;
// Lumberjack.log(Level.INFO, "passes: "+passes);
final Tessellator tess = Tessellator.instance;
for (int i = 0; i < passes; i++) {
icon = this.getStackIcon(item, i, player);
// Lumberjack.log(Level.INFO, "icon "+i+": "+icon);
f = icon.getMinU();
f1 = icon.getMaxU();
f2 = icon.getMinV();
@@ -192,8 +175,8 @@ public class CosmicItemRenderer implements IItemRenderer {
public void processLightLevel(ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY: {
EntityItem ent = (EntityItem) (data[1]);
case ENTITY, EQUIPPED, EQUIPPED_FIRST_PERSON: {
Entity ent = (Entity) (data[1]);
if (ent != null) {
CosmicRenderShenanigans.setLightFromLocation(
ent.worldObj,
@@ -203,35 +186,8 @@ public class CosmicItemRenderer implements IItemRenderer {
}
break;
}
case EQUIPPED: {
EntityLivingBase ent = (EntityLivingBase) (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_FIRST_PERSON: {
EntityLivingBase ent = (EntityLivingBase) (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 INVENTORY: {
CosmicRenderShenanigans.setLightLevel(1.2f);
return;
}
default: {
CosmicRenderShenanigans.setLightLevel(1.0f);
return;
}
}
}
@@ -4,102 +4,39 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.world.World;
import org.lwjgl.opengl.ARBShaderObjects;
import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.shaders.UniversiumShader;
import com.gtnewhorizon.gtnhlib.client.renderer.shader.ShaderProgram;
public class CosmicRenderShenanigans {
public static final ShaderCallback shaderCallback;
public static float[] lightlevel = new float[3];
public static boolean inventoryRender = false;
public static float cosmicOpacity = 1.0f;
static {
shaderCallback = new ShaderCallback() {
@Override
public void call(int shader) {
Minecraft mc = Minecraft.getMinecraft();
float yaw = 0;
float pitch = 0;
float scale = 1.0f;
if (!inventoryRender) {
yaw = (float) ((mc.thePlayer.rotationYaw * 2 * Math.PI) / 360.0);
pitch = -(float) ((mc.thePlayer.rotationPitch * 2 * Math.PI) / 360.0);
} else {
scale = 25.0f;
}
int time2 = ARBShaderObjects.glGetUniformLocationARB(shader, "time2");
ARBShaderObjects.glUniform1fARB(time2, mc.thePlayer.ticksExisted);
int x = ARBShaderObjects.glGetUniformLocationARB(shader, "yaw");
ARBShaderObjects.glUniform1fARB(x, yaw);
int z = ARBShaderObjects.glGetUniformLocationARB(shader, "pitch");
ARBShaderObjects.glUniform1fARB(z, pitch);
int l = ARBShaderObjects.glGetUniformLocationARB(shader, "lightlevel");
ARBShaderObjects.glUniform3fARB(l, lightlevel[0], lightlevel[1], lightlevel[2]);
int lightmix = ARBShaderObjects.glGetUniformLocationARB(shader, "lightmix");
ARBShaderObjects.glUniform1fARB(lightmix, 0.2f);
int uvs = ARBShaderObjects.glGetUniformLocationARB(shader, "cosmicuvs");
ARBShaderObjects.glUniformMatrix2ARB(uvs, false, LudicrousRenderEvents.cosmicUVs);
int s = ARBShaderObjects.glGetUniformLocationARB(shader, "externalScale");
ARBShaderObjects.glUniform1fARB(s, scale);
int o = ARBShaderObjects.glGetUniformLocationARB(shader, "opacity");
ARBShaderObjects.glUniform1fARB(o, cosmicOpacity);
}
};
}
public static void useShader() {
ShaderHelper.useShader(ShaderHelper.cosmicShader, shaderCallback);
final UniversiumShader shader = UniversiumShader.getInstance();
if (inventoryRender) {
shader.setRenderInInventory();
}
if (cosmicOpacity != 1.0f) {
shader.setCosmicOpacity(cosmicOpacity);
}
shader.use();
}
public static void releaseShader() {
ShaderHelper.releaseShader();
ShaderProgram.unbind();
}
public static void setLightFromLocation(World world, int x, int y, int z) {
if (world == null) {
setLightLevel(1.0f);
return;
}
int coord = world.getLightBrightnessForSkyBlocks(x, y, z, 0);
int[] map = Minecraft.getMinecraft().entityRenderer.lightmapColors;
if (map == null) {
setLightLevel(1.0f);
return;
}
int mx = (coord % 65536) / 16;
int my = (coord / 65536) / 16;
int lightcolour = map[Math.max(0, Math.min(map.length - 1, my * 16 + mx))];
setLightLevel(
((lightcolour >> 16) & 0xFF) / 256.0f,
((lightcolour >> 8) & 0xFF) / 256.0f,
((lightcolour) & 0xFF) / 256.0f);
UniversiumShader.getInstance().setLightFromLocation(world, x, y, z);
}
public static void setLightLevel(float level) {
setLightLevel(level, level, level);
UniversiumShader.getInstance().setLightLevel(level);
}
public static void setLightLevel(float r, float g, float b) {
lightlevel[0] = Math.max(0.0f, Math.min(1.0f, r));
lightlevel[1] = Math.max(0.0f, Math.min(1.0f, g));
lightlevel[2] = Math.max(0.0f, Math.min(1.0f, b));
UniversiumShader.getInstance().setLightLevel(r, g, b);
}
public static void bindItemTexture() {
@@ -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,46 +1,19 @@
package fox.spiteful.avaritia.render;
import java.nio.FloatBuffer;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent;
import fox.spiteful.avaritia.Avaritia;
public class LudicrousRenderEvents {
private static final int cosmicCount = 10;
public static final String[] cosmicTextures = new String[cosmicCount];
static {
for (int i = 0; i < cosmicCount; i++) {
cosmicTextures[i] = "avaritia:cosmic" + i;
}
}
public static final FloatBuffer cosmicUVs = BufferUtils.createFloatBuffer(4 * cosmicTextures.length);
public static final IIcon[] cosmicIcons = new IIcon[cosmicTextures.length];
@SubscribeEvent
public void letsMakeAQuilt(TextureStitchEvent.Pre event) {
if (event.map.getTextureType() != 1) {
return;
}
for (int i = 0; i < cosmicTextures.length; i++) {
IIcon icon = event.map.registerIcon(cosmicTextures[i]);
cosmicIcons[i] = icon;
}
ModelArmorInfinity.overlayIcon = event.map.registerIcon("avaritia:infinity_armor_mask");
ModelArmorInfinity.invulnOverlayIcon = event.map.registerIcon("avaritia:infinity_armor_mask2");
ModelArmorInfinity.wingOverlayIcon = event.map.registerIcon("avaritia:infinity_armor_wingmask");
@@ -59,31 +32,4 @@ public class LudicrousRenderEvents {
ModelArmorInfinity.armorModel.rebuildOverlay();
ModelArmorInfinity.legModel.rebuildOverlay();
}
@SubscribeEvent
public void pushTheCosmicFancinessToTheLimit(RenderTickEvent event) {
if (event.phase == Phase.START) {
for (IIcon icon : cosmicIcons) {
if (Avaritia.isHodgepodgeLoaded
&& icon instanceof IPatchedTextureAtlasSprite patchedTextureAtlasSprite) {
patchedTextureAtlasSprite.markNeedsAnimationUpdate();
}
cosmicUVs.put(icon.getMinU());
cosmicUVs.put(icon.getMinV());
cosmicUVs.put(icon.getMaxU());
cosmicUVs.put(icon.getMaxV());
}
cosmicUVs.flip();
}
}
@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);
@@ -1,6 +0,0 @@
package fox.spiteful.avaritia.render;
public abstract class ShaderCallback {
public abstract void call(int shader);
}
@@ -1,169 +0,0 @@
/**
* Original class written by Vazkii for Botania.
*/
// TEMA: this is the main shader stuff, where the programs are loaded and compiled for the card.
// other relevant files are the shader in /assets/physis/shader/, and the tesr in /client/render/tile/
// they have other comments like this in.
package fox.spiteful.avaritia.render;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper;
import org.apache.logging.log4j.Level;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.ARBVertexShader;
import org.lwjgl.opengl.GL11;
import fox.spiteful.avaritia.Lumberjack;
public final class ShaderHelper {
private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB;
private static final int FRAG = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;
private static final String PREFIX = "/assets/avaritia/shader/";
public static int cosmicShader = 0;
public static void initShaders() {
if (!useShaders()) return;
cosmicShader = createProgram("cosmic.vert", "cosmic.frag");
}
public static void useShader(int shader, ShaderCallback callback) {
if (!useShaders()) return;
ARBShaderObjects.glUseProgramObjectARB(shader);
if (shader != 0) {
int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time");
Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer != null && mc.thePlayer.worldObj != null) {
ARBShaderObjects.glUniform1iARB(time, (int) (mc.thePlayer.worldObj.getWorldTime() % Integer.MAX_VALUE));
}
if (callback != null) callback.call(shader);
}
}
public static void useShader(int shader) {
useShader(shader, null);
}
public static void releaseShader() {
useShader(0);
}
public static boolean useShaders() {
return OpenGlHelper.shadersSupported;
}
// Most of the code taken from the LWJGL wiki
// http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL
private static int createProgram(String vert, String frag) {
int vertId = 0, fragId = 0, program = 0;
if (vert != null) vertId = createShader(PREFIX + vert, VERT);
if (frag != null) fragId = createShader(PREFIX + frag, FRAG);
program = ARBShaderObjects.glCreateProgramObjectARB();
if (program == 0) return 0;
if (vert != null) ARBShaderObjects.glAttachObjectARB(program, vertId);
if (frag != null) ARBShaderObjects.glAttachObjectARB(program, fragId);
ARBShaderObjects.glLinkProgramARB(program);
if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_LINK_STATUS_ARB)
== GL11.GL_FALSE) {
Lumberjack.log(Level.ERROR, getLogInfo(program));
return 0;
}
ARBShaderObjects.glValidateProgramARB(program);
if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_VALIDATE_STATUS_ARB)
== GL11.GL_FALSE) {
Lumberjack.log(Level.ERROR, getLogInfo(program));
return 0;
}
return program;
}
private static int createShader(String filename, int shaderType) {
int shader = 0;
try {
shader = ARBShaderObjects.glCreateShaderObjectARB(shaderType);
if (shader == 0) return 0;
ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(filename));
ARBShaderObjects.glCompileShaderARB(shader);
if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB)
== GL11.GL_FALSE)
throw new RuntimeException("Error creating shader \"" + filename + "\": " + getLogInfo(shader));
return shader;
} catch (Exception e) {
ARBShaderObjects.glDeleteObjectARB(shader);
e.printStackTrace();
return -1;
}
}
private static String getLogInfo(int obj) {
return ARBShaderObjects.glGetInfoLogARB(
obj,
ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB));
}
private static String readFileAsString(String filename) throws Exception {
StringBuilder source = new StringBuilder();
InputStream in = ShaderHelper.class.getResourceAsStream(filename);
Exception exception = null;
BufferedReader reader;
if (in == null) return "";
try {
reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
Exception innerExc = null;
try {
String line;
while ((line = reader.readLine()) != null) source.append(line).append('\n');
} catch (Exception exc) {
exception = exc;
} finally {
try {
reader.close();
} catch (Exception exc) {
if (innerExc == null) innerExc = exc;
else exc.printStackTrace();
}
}
if (innerExc != null) throw innerExc;
} catch (Exception exc) {
exception = exc;
} finally {
try {
in.close();
} catch (Exception exc) {
if (exception == null) exception = exc;
else exc.printStackTrace();
}
if (exception != null) throw exception;
}
return source.toString();
}
}