Merge remote-tracking branch 'origin/1.16.5-forge' into 1.17.1-forge

Author: Goldenfield192

…in/java/cam72cam/mod/UMCMixinPlugin.java …a/cam72cam/mod/UMCMixinExtrasLoader.javasrc/main/java/cam72cam/mod/UMCMixinPlugin.java renamed to src/main/java/cam72cam/mod/UMCMixinExtrasLoader.java src/main/java/cam72cam/mod/UMCMixinPlugin.java renamed to src/main/java/cam72cam/mod/UMCMixinExtrasLoader.java

@@ -9,11 +9,11 @@
 import java.util.List;
 import java.util.Set;
 
-public class UMCMixinPlugin implements IMixinConfigPlugin {
+public class UMCMixinExtrasLoader implements IMixinConfigPlugin {
     @Override
     public void onLoad(String mixinPackage) {
         MixinExtrasBootstrap.init();
-     }
+    }
 
     @Override
     public String getRefMapperConfig() {

src/main/java/cam72cam/mod/event/ClientEvents.java

@@ -119,11 +119,11 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
         }
 
         private static void onGuiMouse(GuiScreenEvent.MouseInputEvent event, int btn, MouseAction action) {
-            MouseGuiEvent mevt = new MouseGuiEvent(action, (int) event.getMouseX(), (int) event.getMouseY(), btn, event instanceof GuiScreenEvent.MouseScrollEvent ? (int) ((GuiScreenEvent.MouseScrollEvent) event).getScrollDelta() : 0);
+            MouseGuiEvent mevt = new MouseGuiEvent(action, (int) event.getMouseX(), (int) event.getMouseY(), btn, action == MouseAction.SCROLL ? (int) ((GuiScreenEvent.MouseScrollEvent) event).getScrollDelta() : 0);
 
             if (!MOUSE_GUI.executeCancellable(h -> h.apply(mevt))) {
                 event.setCanceled(true);
-                if (!(event instanceof GuiScreenEvent.MouseScrollEvent)) {
+                if (action != MouseAction.SCROLL) {
                     // Apparently cancelling this input event only cancels it for the *GUI* handlers, not all input handlers
                     // Therefore we need to track that ourselves.  Thanks for changing that from 1.12.2-forge
                     skipNextMouseInputEvent = true;
@@ -145,7 +145,7 @@ public static void onGuiRelease(GuiScreenEvent.MouseReleasedEvent.Pre event) {
         }
         @SubscribeEvent
         public static void onGuiScroll(GuiScreenEvent.MouseScrollEvent.Pre event) {
-            onGuiMouse(event, -1, MouseAction.RELEASE);
+            onGuiMouse(event, -1, MouseAction.SCROLL);
         }
 
         private static void hackInputState(InputEvent.MouseInputEvent event) {

src/main/java/cam72cam/mod/serialization/TagSerializer.java

@@ -1,6 +1,5 @@
 package cam72cam.mod.serialization;
 
-import cam72cam.mod.ModCore;
 import cam72cam.mod.world.World;
 
 import javax.annotation.Nullable;
@@ -61,14 +60,7 @@ private static void init(Class<?> cls) throws SerializationException {
                     String fieldName = tag.value().isEmpty() ? field.getName() : tag.value();
 
                     if (Modifier.isFinal(field.getModifiers())) {
-                        ModCore.warn("A mod is trying to deserialize a tag into a final field %s.  This should never have been implemented and will be removed in future versions.  You have been warned.", fieldName);
-                        try {
-                            Field modifiersField = Field.class.getDeclaredField("modifiers");
-                            modifiersField.setAccessible(true);
-                            modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-                        } catch (NoSuchFieldException | IllegalAccessException e) {
-                            throw new SerializationException(String.format("Unable to access field %s in class %s", fieldName, cls), e);
-                        }
+                        throw new SerializationException(String.format("A mod is trying to deserialize a tag into a final field %s.%s.  This is not supported.", cls.getName(), field.getName()));
                     }
 
                     TagMapped mapped = field.getType().getAnnotation(TagMapped.class);

src/main/resources/mixins.feat.universalmodcore.json

@@ -2,9 +2,9 @@
   "required": true,
   "package": "cam72cam.mod.mixin.feat",
   "refmap": "mixins.universalmodcore.refmap.json",
+  "plugin": "cam72cam.mod.UMCMixinExtrasLoader",
   "target": "@env(DEFAULT)",
   "minVersion": "0.8.2",
-  "plugin": "cam72cam.mod.UMCMixinPlugin",
   "compatibilityLevel": "JAVA_8",
   "mixinPriority": 1300,
   "mixins": [

src/test/java/cam72cam/mod/serialization/Test.java

@@ -436,7 +436,7 @@ public void testSubObjects() throws SerializationException {
     }
 
     @TagField
-    private final Integer hidden = 0;
+    private Integer hidden = 0;
 
     @org.junit.jupiter.api.Test
     public void testHidden() throws SerializationException {
@@ -465,7 +465,7 @@ public TagAccessor<CustomClass> apply(Class<CustomClass> type, String fieldName,
 
     @TagMapped(CustomMapper.class)
     public static class CustomClass {
-        private final Integer field;
+        private Integer field;
 
         public CustomClass(Integer integer) {
             this.field = integer;