upstream/Angelica
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Angelica.git synced 2026-10-25 20:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update entity.properties formatting (#1197)

Browse Source 
* Update entity.properties formatting

1.7.10 doesn't have namespaces like modern does, this code updates this so that Angelica can handle names such as XPOrb or Creeper.

* Allows shaders to target Lightning Bolts

Lightning bolts within 1.7.10 are not registered, this allows shader devs to target the lightning bolt like it does in modern.

* Additional fixes

* Adds back getEntityId as a fallback
This commit is contained in:
Eclipse-Sol authored and GitHub committed 2025-12-27 09:04:37 -08:00
1 parent 1649c3c0c6
commit 2c808fae43
1 file changed
+27 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java
+27 -1
View File
@@ -8,16 +8,19 @@ import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import it.unimi.dsi.fastutil.objects.Object2IntFunction;
import lombok.Getter;
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
import net.coderbot.iris.Iris;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.HandRenderer;
import net.coderbot.iris.pipeline.ShadowRenderer;
import net.coderbot.iris.pipeline.WorldRenderingPhase;
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
import net.coderbot.iris.shaderpack.materialmap.NamespacedId;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
@@ -30,7 +33,9 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.init.Blocks;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Final;
@@ -63,6 +68,7 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
@Unique private SodiumWorldRenderer renderer;
private int sodium$frame;
private static final String LIGHTNING_BOLT_ENTITY_TYPE = "lightning_bolt";
@Override
public void scheduleTerrainUpdate() {
@@ -319,7 +325,27 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
@WrapOperation(method="renderEntities", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/entity/RenderManager;renderEntitySimple(Lnet/minecraft/entity/Entity;F)Z"))
private boolean angelica$renderEntitySimple(RenderManager instance, Entity entity, float partialTicks, Operation<Boolean> original) {
CapturedRenderingState.INSTANCE.setCurrentEntity(entity.getEntityId());
int entityId = entity.getEntityId();
Object2IntFunction<NamespacedId> entityIdMap = BlockRenderingSettings.INSTANCE.getEntityIds();
if (entityIdMap != null) {
// Get the entity type string (e.g., "XPOrb", "Creeper", "Zombie")
String entityType = EntityList.getEntityString(entity);
// Quick way of getting an unregistered entity. Not sure if there's a fast way to extend this to all unregistered entities.
if (entityType == null) {
if (entity instanceof EntityLightningBolt) {
entityType = LIGHTNING_BOLT_ENTITY_TYPE;
}
}
if (entityType != null) {
entityId = entityIdMap.applyAsInt(new NamespacedId(entityType));
}
}
// May cause slowdown. Not sure if this matters too much at the moment. Probably needs profiling.
CapturedRenderingState.INSTANCE.setCurrentEntity(entityId);
GbufferPrograms.beginEntities();
try {
return original.call(instance, entity, partialTicks);