Merge pull request #85 from ferriarnus/backport-1.20

Backport 1.20 changes
InnovativeOnlineIndustries · Oct 8, 2023 · ed771e9 · ed771e9
2 parents 5031014 + b57a241
commit ed771e9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 117 deletions.
diff --git a/Common/src/main/java/com/hrznstudio/emojiful/mixin/ChatScreenMixin.java b/Common/src/main/java/com/hrznstudio/emojiful/mixin/ChatScreenMixin.java
diff --git a/Common/src/main/java/com/hrznstudio/emojiful/mixin/ShortReplacementMixin.java b/Common/src/main/java/com/hrznstudio/emojiful/mixin/ShortReplacementMixin.java
diff --git a/Common/src/main/java/com/hrznstudio/emojiful/render/EmojiFontRenderer.java b/Common/src/main/java/com/hrznstudio/emojiful/render/EmojiFontRenderer.java
@@ -119,11 +119,6 @@ public int width(FormattedCharSequence processor) {
         return width(builder.toString());
     }
 
-    @Override
-    public int drawInBatch(String p_228079_1_, float p_228079_2_, float p_228079_3_, int p_228079_4_, boolean p_228079_5_, Matrix4f p_228079_6_, MultiBufferSource p_228079_7_, boolean p_228079_8_, int p_228079_9_, int p_228079_10_) {
-        return super.drawInBatch(p_228079_1_, p_228079_2_, p_228079_3_, p_228079_4_, p_228079_5_, p_228079_6_, p_228079_7_, p_228079_8_, p_228079_9_, p_228079_10_);
-    }
-
     @Override
     public float renderText(String text, float x, float y, int color, boolean isShadow, Matrix4f matrix, MultiBufferSource buffer, boolean isTransparent, int colorBackgroundIn, int packedLight) {
         if (text.isEmpty())
@@ -288,7 +283,7 @@ public boolean accept(int pos, Style style, int charInt) {
                     float f5 = flag ? iglyph.getBoldOffset() : 0.0F;
                     float f4 = this.dropShadow ? iglyph.getShadowOffset() : 0.0F;
                     VertexConsumer ivertexbuilder = this.buffer.getBuffer(texturedglyph.renderType(this.seeThrough ? DisplayMode.SEE_THROUGH : DisplayMode.NORMAL));
-                    (EmojiFontRenderer.this).renderChar(texturedglyph, flag, style.isItalic(), f5, this.x + f4, this.y + f4, this.matrix, ivertexbuilder, f, f1, f2, f3, this.packedLight);
+                    EmojiFontRenderer.this.renderChar(texturedglyph, flag, style.isItalic(), f5, this.x + f4, this.y + f4, this.matrix, ivertexbuilder, f, f1, f2, f3, this.packedLight);
                 }
 
                 float f6 = iglyph.getAdvance(flag);

diff --git a/Common/src/main/resources/emojiful.mixins.json b/Common/src/main/resources/emojiful.mixins.json
@@ -7,9 +7,7 @@
     "mixins": [
     ],
     "client": [
-      "ChatScreenMixin",
-      "MinecraftEmojifulMixin",
-      "ShortReplacementMixin"
+      "MinecraftEmojifulMixin"
     ],
     "injectors": {
       "defaultRequire": 1