Merge remote-tracking branch 'origin/1.19.4-forge' into 1.20.1-forge

Goldenfield192 · Goldenfield192 · commit d6f6a8075137 · 2026-02-12T16:36:57.000+08:00
diff --git a/src/main/java/cam72cam/mod/ModCore.java b/src/main/java/cam72cam/mod/ModCore.java
@@ -67,7 +67,6 @@
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /** UMC Mod, do not touch... */
@@ -91,20 +90,20 @@ public static void register(Mod ctr) {
     }
 
     /** Called during Mod Construction phase */
-    public ModCore() {
+    public ModCore(FMLJavaModLoadingContext context) {
         System.out.println("Welcome to UniversalModCore!");
         instance = this;
 
         ModCore.register(new Internal());
         proxy.setup();
 
 
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::preInit);
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::postInit);
-        //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::serverStarting);
-        //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::serverStarted);
-        CommonEvents.Item.CREATIVE_TAB.register(FMLJavaModLoadingContext.get().getModEventBus());
+        context.getModEventBus().addListener(this::preInit);
+        context.getModEventBus().addListener(this::init);
+        context.getModEventBus().addListener(this::postInit);
+        //context.getModEventBus().addListener(this::serverStarting);
+        //context.getModEventBus().addListener(this::serverStarted);
+        CommonEvents.Item.CREATIVE_TAB.register(context.getModEventBus());
 
         MinecraftForge.EVENT_BUS.register(this);
     }
diff --git a/src/main/java/cam72cam/mod/event/ClientEvents.java b/src/main/java/cam72cam/mod/event/ClientEvents.java
@@ -233,7 +233,6 @@ public static void onRenderMouseover(RenderHighlightEvent.Block event) {
             // TODO 1.15+ do we need to set lightmap coords here?
             RENDER_MOUSEOVER.execute(x -> x.accept(event));
             RenderType.cutout().clearRenderState();
-            RenderContext.resetState();
         }
 
         @SubscribeEvent
diff --git a/src/main/java/cam72cam/mod/gui/screen/IScreen.java b/src/main/java/cam72cam/mod/gui/screen/IScreen.java
@@ -4,14 +4,19 @@
 import cam72cam.mod.input.Keyboard;
 import cam72cam.mod.render.opengl.RenderState;
 
+import javax.annotation.Nullable;
+
 public interface IScreen {
     /** Called when screen is initially constructed */
     void init(IScreenBuilder screen);
 
     @Deprecated
     default void onEnterKey(IScreenBuilder builder) { }
-    /** Called when any key is pressed outside textfield */
-    default void onKeyType(IScreenBuilder builder, Keyboard.KeyCode keyCode){
+    /**
+     * Called when any key is pressed outside textfield
+     * @param keyCode The typed key's code, or null if not recognizable
+     * */
+    default void onKeyType(IScreenBuilder builder, @Nullable Keyboard.KeyCode keyCode){
         if (keyCode == Keyboard.KeyCode.NUMPADENTER || keyCode == Keyboard.KeyCode.RETURN) {
             onEnterKey(builder);
         }
diff --git a/src/main/java/cam72cam/mod/input/Keyboard.java b/src/main/java/cam72cam/mod/input/Keyboard.java
@@ -10,7 +10,11 @@
 import net.minecraftforge.client.settings.KeyConflictContext;
 import org.lwjgl.glfw.GLFW;
 
+import javax.annotation.Nullable;
+
 public class Keyboard {
+    private static final Int2ObjectArrayMap<KeyCode> keycodes = new Int2ObjectArrayMap<>();
+
     public enum KeyCode {
         ESCAPE(GLFW.GLFW_KEY_ESCAPE),
         NUM1(GLFW.GLFW_KEY_1),
@@ -128,13 +132,11 @@ public enum KeyCode {
             keycodes.put(code, this);
         }
 
-        public static KeyCode of(int code) {
+        public static @Nullable KeyCode of(int code) {
             return keycodes.get(code);
         }
     }
 
-    private static final Int2ObjectArrayMap<KeyCode> keycodes = new Int2ObjectArrayMap<>();
-
     /** Registers a keybind */
     @OnlyIn(Dist.CLIENT)
     public static void registerKey(String name, KeyCode keyCode, String category, Runnable handler) {
diff --git a/src/main/java/cam72cam/mod/mixin/feat/global_renderer/MixinRenderGlobal.java b/src/main/java/cam72cam/mod/mixin/feat/global_renderer/MixinRenderGlobal.java
@@ -29,6 +29,5 @@ public void injectRenderGlobal(PoseStack stack, float partialTicks, long p_22842
         RenderState state = new RenderState(stack).translate(-pos.x, -pos.y, -pos.z);
         GlobalRender.renderGlobalFuncs(state.clone(), partialTicks);
         RenderType.cutoutMipped().clearRenderState();
-        RenderContext.resetState();
     }
 }
diff --git a/src/main/java/cam72cam/mod/render/BlockRender.java b/src/main/java/cam72cam/mod/render/BlockRender.java
@@ -116,7 +116,6 @@ public void render(TileEntity te, float partialTicks, PoseStack var3, MultiBuffe
                     model.renderCustom(new RenderState(var3).lightmap(j/240f, k/240f).stage(RenderContext.Stage.BLOCK), partialTicks);
 
                     RenderType.cutoutMipped().clearRenderState();
-                    RenderContext.resetState();
                 }
 
                 @Override
diff --git a/src/main/java/cam72cam/mod/render/opengl/RenderContext.java b/src/main/java/cam72cam/mod/render/opengl/RenderContext.java
@@ -11,7 +11,6 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormatElement;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.ShaderInstance;
 import org.joml.Matrix4f;
 import org.lwjgl.opengl.GL11;
@@ -23,6 +22,9 @@
 import static cam72cam.mod.render.opengl.Texture.NO_TEXTURE;
 
 public class RenderContext {
+    //Lightmap UV coordinate for full bright
+    public static final int FULL_BRIGHT = 240;
+
     //Modified from rendertype_entity_cutout, fix model normal
     public static ShaderInstance UMC_CORE;
 
@@ -37,29 +39,10 @@ private RenderContext() {
     }
 
     public static With apply(RenderState state) {
-        return apply(state, false);
-    }
-
-    /**
-     *  Internal, use the method above
-     *  <p>
-     *  In some 1.19.4+ cases we can't use beacon shader but in other cases have to, so we added an alternative here
-     *  <p>
-     *  Assuming that only OBJ-related need beacon shader for now
-     */
-    public static With apply(RenderState state, boolean useBeaconShader) {
         RenderContext.checkError();
         List<Runnable> restore = new ArrayList<>();
 
-        ShaderInstance shader;
-        boolean vanillaEmissive = state.lightmap != null
-                                  && state.lightmap[0] == 1 && state.lightmap[1] == 1
-                                  && !ShaderHelper.isShaderPackEnabled();
-        if (vanillaEmissive && useBeaconShader) {
-            shader = GameRenderer.getRendertypeBeaconBeamShader();
-        } else {
-            shader = RenderSystem.getShader();
-        }
+        ShaderInstance shader = RenderSystem.getShader();
         if (state.model_view != null) {
             Matrix4f oldModelView = new Matrix4f(RenderSystem.getModelViewMatrix());
             restore.add(() -> RenderSystem.getModelViewMatrix().set(oldModelView));
@@ -95,8 +78,8 @@ public static With apply(RenderState state, boolean useBeaconShader) {
             restore.add(() -> RenderSystem.setShaderColor(oldColor[0], oldColor[1], oldColor[2], oldColor[3]));
         }
 
-        //TODO Without Iris there may be some kinds of light bug like 1.16 era...figure out why
-        if (state.lightmap != null && !vanillaEmissive) {
+        if (state.lightmap != null) {
+            //Our custom shader will handle vanilla emissive stuff
             float oldX;
             float oldY;
             if (state.stage == Stage.ENTITY) {
@@ -241,8 +224,9 @@ private static void setupLightMap(ShaderInstance shader, float oldX, float oldY)
             if (element.getUsage() == VertexFormatElement.Usage.UV) {
                 for (Map.Entry<String, VertexFormatElement> entry : shader.getVertexFormat().getElementMapping().entrySet()) {
                     if (entry.getValue() == element && entry.getKey().equals("UV2")) {
-                        int x = (int) (oldX * 240);
-                        int y = (int) (oldY * 240);
+                        //240 means full bright
+                        int x = (int) (oldX * RenderContext.FULL_BRIGHT);
+                        int y = (int) (oldY * RenderContext.FULL_BRIGHT);
                         GL32.glVertexAttribI2i(i, x, y);
                     }
                 }
@@ -294,9 +278,4 @@ public enum Stage {
 
         NONE
     }
-
-    public static void resetState() {
-        RenderSystem.defaultBlendFunc();
-        RenderSystem.setShaderColor(1,1,1,1);
-    }
 }
diff --git a/src/main/java/cam72cam/mod/render/opengl/VBO.java b/src/main/java/cam72cam/mod/render/opengl/VBO.java
@@ -210,10 +210,9 @@ protected Binding(RenderState state, boolean wait) {
                         GL32.glVertexAttribPointer(i, 3, GL32.GL_FLOAT, false, stride, (long) vbInfo.vertexOffset * Float.BYTES);
                     }
                     case NORMAL -> {
-                        if (vbInfo.hasNormals) {
-                            GL32.glEnableVertexAttribArray(i);
-                            GL32.glVertexAttribPointer(i, 3, GL32.GL_FLOAT, true, stride, (long) vbInfo.normalOffset * Float.BYTES);
-                        }
+                        if (!vbInfo.hasNormals) continue;
+                        GL32.glEnableVertexAttribArray(i);
+                        GL32.glVertexAttribPointer(i, 3, GL32.GL_FLOAT, true, stride, (long) vbInfo.normalOffset * Float.BYTES);
                     }
                     case COLOR -> {
                         GL32.glEnableVertexAttribArray(i);
@@ -222,21 +221,26 @@ protected Binding(RenderState state, boolean wait) {
                     case UV -> {
                         for (Map.Entry<String, VertexFormatElement> entry : shader.getVertexFormat().getElementMapping().entrySet()) {
                             if (entry.getValue() == element) {
-                                if (entry.getKey().equals("UV0")) {
-                                    GL32.glEnableVertexAttribArray(i);
-                                    GL32.glVertexAttribPointer(i, 2, GL32.GL_FLOAT, false, stride, (long) vbInfo.textureOffset * Float.BYTES);
-                                } else if (entry.getKey().equals("UV1")) {
-                                    GL32.glDisableVertexAttribArray(i);
-                                    GL32.glVertexAttribI2i(i, 0, 10);
-                                } else if (entry.getKey().equals("UV2")) {
-                                    GL32.glDisableVertexAttribArray(i);
-                                    int x = 240;
-                                    int y = 240;
-                                    if (state.lightmap != null) {
-                                        x = (int) (state.lightmap[0] * 240);
-                                        y = (int) (state.lightmap[1] * 240);
+                                switch (entry.getKey()) {
+                                    case "UV0" -> {
+                                        GL32.glEnableVertexAttribArray(i);
+                                        GL32.glVertexAttribPointer(i, 2, GL32.GL_FLOAT, false, stride, (long) vbInfo.textureOffset * Float.BYTES);
+                                    }
+                                    case "UV1" -> {
+                                        GL32.glDisableVertexAttribArray(i);
+                                        GL32.glVertexAttribI2i(i, 0, 10);
+                                    }
+                                    case "UV2" -> {
+                                        GL32.glDisableVertexAttribArray(i);
+                                        //240 means full bright
+                                        int x = RenderContext.FULL_BRIGHT;
+                                        int y = RenderContext.FULL_BRIGHT;
+                                        if (state.lightmap != null) {
+                                            x = (int) (state.lightmap[0] * RenderContext.FULL_BRIGHT);
+                                            y = (int) (state.lightmap[1] * RenderContext.FULL_BRIGHT);
+                                        }
+                                        GL32.glVertexAttribI2i(i, x, y);
                                     }
-                                    GL32.glVertexAttribI2i(i, x, y);
                                 }
                             }
                         }
@@ -245,7 +249,7 @@ protected Binding(RenderState state, boolean wait) {
             }
             RenderContext.checkError();
 
-            this.restore = RenderContext.apply(state, true).and(() -> {
+            this.restore = RenderContext.apply(state).and(() -> {
                 RenderContext.checkError();
                 shader.getVertexFormat().clearBufferState();
 
@@ -270,7 +274,7 @@ protected With push(Consumer<RenderState> mod) {
             }
             RenderState state = this.state.clone();
             mod.accept(state);
-            return RenderContext.apply(state, true);
+            return RenderContext.apply(state);
         }
 
         /**
diff --git a/src/main/java/cam72cam/mod/world/WorldEntityTracker.java b/src/main/java/cam72cam/mod/world/WorldEntityTracker.java
@@ -61,20 +61,19 @@ public void join(ModdedEntity entity) {
     }
 
     public void leave(ModdedEntity entity) {
-        BlockPos pos = entity.blockPosition();
-        long sec = SectionPos.asLong(pos);
+        long chunk = SectionPos.asLong(entity.blockPosition());
 
         lock.writeLock().lock();
         try {
-            if (!umcEntities.containsKey(sec)) {
+            if (!umcEntities.containsKey(chunk)) {
                 return;
             }
-            Collection<ModdedEntity> moddedEntities = umcEntities.get(sec);
+            Collection<ModdedEntity> moddedEntities = umcEntities.get(chunk);
             moddedEntities.remove(entity);
 
             if (moddedEntities.isEmpty()) {
-                umcEntities.remove(sec);
-                scanningRange.removeKey(sec);
+                umcEntities.remove(chunk);
+                scanningRange.removeKey(chunk);
             }
         } finally {
             lock.writeLock().unlock();
@@ -84,6 +83,12 @@ public void leave(ModdedEntity entity) {
     public void move(ModdedEntity entity, long oldSection, long newSection) {
         lock.writeLock().lock();
         try {
+            if (!umcEntities.containsKey(oldSection)) {
+                //Newly added, no need to process here
+                //Let join handle it
+                return;
+            }
+
             // remove from old section
             Set<ModdedEntity> moddedEntities = umcEntities.get(oldSection);
             if (moddedEntities != null) {
diff --git a/src/main/resources/assets/minecraft/shaders/core/umc_core.vsh b/src/main/resources/assets/minecraft/shaders/core/umc_core.vsh
@@ -26,12 +26,22 @@ out vec2 texCoord0;
 out vec4 normal;
 
 void main() {
-    gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
+    vec4 viewPos = ModelViewMat * vec4(Position, 1.0);
+    gl_Position = ProjMat * viewPos;
 
     vec4 norm = ModelViewMat * vec4(Normal, 0.0);
-    vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz);
-    vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, norm.xyz, Color);
-    lightMapColor = texelFetch(Sampler2, UV2 / 16, 0);
+    vertexDistance = length(viewPos.xyz);
+
+    if (UV2.x == 240 && UV2.y == 240) {
+        //Vanilla emissive
+        //TODO can we optimize this by implementing new vertex format?
+        vertexColor = Color;
+        lightMapColor = texelFetch(Sampler2, ivec2(15, 15), 0);
+    } else {
+        vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, norm.xyz, Color);
+        lightMapColor = texelFetch(Sampler2, UV2 / 16, 0);
+    }
+
     overlayColor = texelFetch(Sampler1, UV1, 0);
     texCoord0 = UV0;
     normal = ProjMat * norm;

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,6 @@ public static void onRenderMouseover(RenderHighlightEvent.Block event) {`
`233`	`233`	`// TODO 1.15+ do we need to set lightmap coords here?`
`234`	`234`	`RENDER_MOUSEOVER.execute(x -> x.accept(event));`
`235`	`235`	`RenderType.cutout().clearRenderState();`
`236`		`- RenderContext.resetState();`
`237`	`236`	`}`
`238`	`237`
`239`	`238`	`@SubscribeEvent`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,5 @@ public void injectRenderGlobal(PoseStack stack, float partialTicks, long p_22842`
`29`	`29`	`RenderState state = new RenderState(stack).translate(-pos.x, -pos.y, -pos.z);`
`30`	`30`	`GlobalRender.renderGlobalFuncs(state.clone(), partialTicks);`
`31`	`31`	`RenderType.cutoutMipped().clearRenderState();`
`32`		`- RenderContext.resetState();`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ public void render(TileEntity te, float partialTicks, PoseStack var3, MultiBuffe`
`116`	`116`	`model.renderCustom(new RenderState(var3).lightmap(j/240f, k/240f).stage(RenderContext.Stage.BLOCK), partialTicks);`
`117`	`117`
`118`	`118`	`RenderType.cutoutMipped().clearRenderState();`
`119`		`- RenderContext.resetState();`
`120`	`119`	`}`
`121`	`120`
`122`	`121`	`@Override`