Beta 2.2.5.2528.0

-Fixed 1.21.6-7 rendering problems

Author: IcaroKB

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx3072M
 
 archives_base_name=FactoryAPI
-mod_version=2.2.5.2527.0
+mod_version=2.2.5.2528.0
 mod_id=factory_api
 mod_name=Factory API
 mod_description=An API that is the basis for mods like Legacy4J, Factocrafty and Better Furnaces Reforged, that work on different mod loaders.

src/main/java/wily/factoryapi/base/client/AdvancedTextWidget.java

@@ -23,7 +23,7 @@ public class AdvancedTextWidget extends SimpleLayoutRenderable implements GuiEve
     private int[] heightPerLine = new int[0];
     private int lineSpacing = 12;
     private boolean centered = false;
-    private int color = 0xFFFFFF;
+    private int color = 0xFFFFFFFF;
     private boolean shadow = true;
     private boolean multipleHeights = true;
 

src/main/java/wily/factoryapi/base/client/FactoryGuiGraphics.java

@@ -141,6 +141,8 @@ default void blitTiledSprite(/*? >=1.21.2 {*/ /*/^? if <1.21.6 {^/Function<Resou
         /*context().blit(function,tile,i,j,Math.min(n,p),Math.min(o,q),l,m,p,q,k);*/
     }
 
+    //? if <1.21.6 {
+
     void setColor(int color, boolean changeBlend);
 
     void setColor(float r, float g, float b, float a, boolean changeBlend);
@@ -164,6 +166,8 @@ default void clearColor(){
         clearColor(false);
     }
 
+    //?}
+
     //? if >=1.21.2 {
     /*void setBlitColor(int color);
 

src/main/java/wily/factoryapi/base/client/UIAccessor.java

@@ -210,14 +210,21 @@ default Renderable createModifiableRenderable(String name, Renderable renderable
                 if (getElements().get(name+".index") instanceof Bearer<?> b) b.secureCast(Integer.class).set(i1);
                 FactoryGuiMatrixStack.of(guiGraphics.pose()).pushPose();
                 int color = getInteger(name+".renderColor", 0xFFFFFFFF);
+                //? if <1.21.6 {
                 FactoryScreenUtil.enableBlend();
                 FactoryGuiGraphics.of(guiGraphics).setColor(color);
+                //?} else
+                /*FactoryGuiGraphics.of(guiGraphics).setBlitColor(color);*/
                 FactoryGuiMatrixStack.of(guiGraphics.pose()).translate(getDouble(name + ".translateX", 0), getDouble(name + ".translateY", 0), getDouble(name + ".translateZ", 0));
                 FactoryGuiMatrixStack.of(guiGraphics.pose()).scale(getFloat(name + ".scaleX", 1), getFloat(name + ".scaleY", 1), getFloat(name + ".scaleZ", 1));
                 renderable.render(guiGraphics, i, j, f);
                 FactoryGuiMatrixStack.of(guiGraphics.pose()).popPose();
                 FactoryScreenUtil.disableBlend();
+                //? if <1.21.6 {
                 FactoryGuiGraphics.of(guiGraphics).clearColor();
+                //?} else
+                /*FactoryGuiGraphics.of(guiGraphics).clearBlitColor();*/
+
             }
         };
     }

src/main/java/wily/factoryapi/base/client/UIDefinitionManager.java

@@ -342,7 +342,7 @@ static void parseTextElements(UIDefinition uiDefinition, String elementName, Dyn
         static void parseDrawStringElements(UIDefinition uiDefinition, Function<UIAccessor, UIAccessor> accessorFunction, String elementName, Dynamic<?> element) {
             parseTextElements(uiDefinition, elementName, element);
             parseTranslationElements(uiDefinition, elementName, element);
-            uiDefinition.getDefinitions().add(UIDefinition.createAfterInit(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".component", Component.class).ifPresent(c -> guiGraphics.drawString(Minecraft.getInstance().font, c, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".color", 0xFFFFFF), a.getBoolean(elementName + ".shadow", true))))))));
+            uiDefinition.getDefinitions().add(UIDefinition.createAfterInit(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".component", Component.class).ifPresent(c -> guiGraphics.drawString(Minecraft.getInstance().font, c, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".color", 0xFFFFFFFF), a.getBoolean(elementName + ".shadow", true))))))));
         }
 
         static void parseDrawMultilineStringElements(UIDefinition uiDefinition, Function<UIAccessor, UIAccessor> accessorFunction, String elementName, Dynamic<?> element) {
@@ -353,7 +353,7 @@ static void parseDrawMultilineStringElements(UIDefinition uiDefinition, Function
                 a.getElement(elementName+".component", Component.class).ifPresent(c-> {
                     int lineSpacing = a.getInteger(elementName+".lineSpacing", 12);
                     int width = a.getInteger(elementName+".width", 0);
-                    AdvancedTextWidget advancedTextWidget = a.putLayoutElement(elementName, accessorFunction.apply(a).addChild(elementName, new AdvancedTextWidget(a).lineSpacing(lineSpacing).withLines(c,width).withColor(a.getInteger(elementName + ".color", 0xFFFFFF)).withShadow(a.getBoolean(elementName + ".shadow", true)).centered(a.getBoolean(elementName + ".centered", false))), i-> {}, i->{});
+                    AdvancedTextWidget advancedTextWidget = a.putLayoutElement(elementName, accessorFunction.apply(a).addChild(elementName, new AdvancedTextWidget(a).lineSpacing(lineSpacing).withLines(c,width).withColor(a.getInteger(elementName + ".color", 0xFFFFFFFF)).withShadow(a.getBoolean(elementName + ".shadow", true)).centered(a.getBoolean(elementName + ".centered", false))), i-> {}, i->{});
                     a.putStaticElement(elementName+".linesCount", advancedTextWidget.getLines().size());
                 });
             }));

src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableButton.java

@@ -86,17 +86,26 @@ public void draw(GuiGraphics graphics) {
     @Override
     public void draw(GuiGraphics graphics, int x, int y) {
         if (color != null)
-            FactoryGuiGraphics.of(graphics).setColor(color.getRed() / 255F,color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+            //? if <1.21.6 {
+            FactoryGuiGraphics.of(graphics).setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1.0F);
+            //?} else
+            /*FactoryGuiGraphics.of(graphics).setBlitColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);*/
         super.draw(graphics, x, y);
-        FactoryGuiGraphics.of(graphics).setColor(1, 1, 1, FactoryGuiGraphics.of(graphics).getColor()[3]);
+        if (color != null)
+            //? if <1.21.6 {
+            FactoryGuiGraphics.of(graphics).clearColor();
+            //?} else
+            /*FactoryGuiGraphics.of(graphics).clearBlitColor();*/
         if (isSelected() || hovered && hoverSelection) {
             if (selection != null) selection.draw(graphics, x, y);
             else graphics.renderOutline(x, y, width(), height(), -1);
         }
     }
+
     public ScreenRectangle getRectangle() {
         return FactoryScreenUtil.rect2iToRectangle(this);
     }
+
     public boolean isSelected(){
         return selected == Boolean.TRUE;
     }

src/main/java/wily/factoryapi/mixin/base/AbstractButtonMixin.java

@@ -44,9 +44,15 @@ public void renderString(GuiGraphics guiGraphics, Font font, int i, CallbackInfo
         ResourceLocation sprite = getSpriteOverride();
         if (sprite != null) {
             FactoryScreenUtil.enableBlend();
-            FactoryGuiGraphics.of(guiGraphics).setColor(1.0f,1.0f,1.0f, alpha);
+            //? if <1.21.6 {
+            FactoryGuiGraphics.of(guiGraphics).setColor(1.0f, 1.0f, 1.0f, alpha);
+            //?} else
+            /*FactoryGuiGraphics.of(guiGraphics).setBlitColor(1.0f, 1.0f, 1.0f, alpha);*/
             FactoryGuiGraphics.of(guiGraphics).blitSprite(sprite, getX(), getY(), getWidth(), getHeight());
-            FactoryGuiGraphics.of(guiGraphics).setColor(1.0f,1.0f,1.0f,1.0f);
+            //? if <1.21.6 {
+            FactoryGuiGraphics.of(guiGraphics).clearColor();
+            //?} else
+            /*FactoryGuiGraphics.of(guiGraphics).clearBlitColor();*/
             FactoryScreenUtil.disableBlend();
         }
     }

src/main/java/wily/factoryapi/mixin/base/GuiGraphicsMixin.java

@@ -220,6 +220,7 @@ public void enableScissor(int x, int y, int xd, int yd, boolean matrixAffects) {
             *///?}
         }
 
+        //? if <1.21.6 {
         @Override
         public void setColor(int color, boolean changeBlend) {
             setColor(ColorUtil.getRed(color), ColorUtil.getGreen(color), ColorUtil.getBlue(color), ColorUtil.getAlpha(color), changeBlend);
@@ -231,13 +232,11 @@ public void setColor(float r, float g, float b, float a, boolean changeBlend) {
                 if (a < 1) FactoryScreenUtil.enableBlend();
                 else FactoryScreenUtil.disableBlend();
             }
-            //? if <1.21.6 {
             //? if >=1.21.2 {
             /*context().flush();
-            RenderSystem.setShaderColor(r,g,b,a);
+            RenderSystem.setShaderColor(r, g, b, a);
             *///?} else {
-            context().setColor(r,g,b,a);
-            //?}
+            context().setColor(r, g, b, a);
             //?}
         }
 
@@ -249,6 +248,7 @@ public float[] getColor() {
             return RenderSystem.getShaderColor();
             //?}
         }
+        //?}
 
         //? if >=1.21.2 {
         /*@Override

src/main/java/wily/factoryapi/util/FactoryGuiElement.java

@@ -91,6 +91,9 @@ public void finalizeRender(GuiGraphics graphics, UIAccessor accessor){
         modifiedPost.invoker.render(graphics);
         int color = getColor(accessor);
         FactoryGuiMatrixStack.of(graphics.pose()).popPose();
+        //? if >=1.21.6 {
+        /*if (color != -1) FactoryGuiGraphics.of(graphics).clearBlitColor();
+         *///?} else
         if (color != -1) FactoryGuiGraphics.of(graphics).clearColor(true);
         post.invoker.render(graphics);
     }

src/main/java/wily/factoryapi/util/FactoryScreenUtil.java

@@ -201,15 +201,18 @@ public static boolean isMouseOver(double mouseX, double mouseY, int posX, int po
         return (mouseX >= posX && mouseX < posX + sizeX && mouseY >= posY && mouseY < posY + sizeY);
     }
 
-    public static void applyOffset(GuiGraphics graphics, float x, float y, float z){
+    public static void applyOffset(GuiGraphics graphics, float x, float y, float z) {
         if (x != 0 || y != 0 | z != 0) FactoryGuiMatrixStack.of(graphics.pose()).translate(x, y, z);
     }
 
-    public static void applyScale(GuiGraphics graphics, float x, float y, float z){
+    public static void applyScale(GuiGraphics graphics, float x, float y, float z) {
         if (x != 1 || y != 1 || z != 1) FactoryGuiMatrixStack.of(graphics.pose()).scale(x, y, z);
     }
 
-    public static void applyColor(GuiGraphics graphics, int color){
+    public static void applyColor(GuiGraphics graphics, int color) {
+        //? if >=1.21.6 {
+        /*if (color != -1) FactoryGuiGraphics.of(graphics).setBlitColor(color);
+        *///?} else
         if (color != -1) FactoryGuiGraphics.of(graphics).setColor(color, true);
     }