Revert "[1.20.x] Fix patch conflicts introduced by neoforged#999 (neo…

…forged#1057)" This reverts commit 623cf3b.
shartte · Jun 7, 2024 · 6cef56a · 6cef56a
1 parent a5c0363
commit 6cef56a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch b/patches/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch
@@ -22,7 +22,7 @@
              GlStateManager._vertexAttribPointer(p_167048_, p_167043_, p_167044_, false, p_167045_, p_167046_);
 @@ -186,6 +_,10 @@
          @OnlyIn(Dist.CLIENT)
-         interface SetupState {
+         public interface SetupState {
              void setupBufferState(int p_167053_, int p_167054_, int p_167055_, long p_167056_, int p_167057_, int p_167058_);
 +        }
 +

diff --git a/patches/net/minecraft/client/gui/Gui.java.patch b/patches/net/minecraft/client/gui/Gui.java.patch
@@ -379,19 +379,18 @@
 +        this.layerManager.initModdedLayers();
 +    }
 +
-     public @OnlyIn(Dist.CLIENT)
--    static enum HeartType {
-+    static enum HeartType implements net.neoforged.neoforge.common.IExtensibleEnum {
+     @OnlyIn(Dist.CLIENT)
+-    public static enum HeartType {
++    public static enum HeartType implements net.neoforged.neoforge.common.IExtensibleEnum {
          CONTAINER(
              new ResourceLocation("hud/heart/container"),
              new ResourceLocation("hud/heart/container_blinking"),
-@@ -1407,7 +_,24 @@
+@@ -1406,8 +_,23 @@
+             } else {
                  gui$hearttype = NORMAL;
              }
-
-+            // Neo: Allow mods to override the heart type with a custom one.
 +            gui$hearttype = net.neoforged.neoforge.event.EventHooks.firePlayerHeartTypeEvent(p_168733_, gui$hearttype);
-+
+ 
              return gui$hearttype;
 +        }
 +

diff --git a/patches/net/minecraft/client/renderer/block/model/ItemOverrides.java.patch b/patches/net/minecraft/client/renderer/block/model/ItemOverrides.java.patch
@@ -47,4 +47,4 @@
 +        return com.google.common.collect.ImmutableList.copyOf(overrides);
      }
 
-     public @OnlyIn(Dist.CLIENT)
+     @OnlyIn(Dist.CLIENT)