make more things compile for fabric

Author: Wyvest

build.gradle.kts

@@ -47,13 +47,15 @@ toolkitLoomHelper {
 }
 
 val releaseVersion = mcData.version as MinecraftReleaseVersion
-val accessTransformerName = "patcher1${releaseVersion.minor}_at.cfg"
+val accessTransformerName = "patcher1${releaseVersion.minor}${if (mcData.isForge) "_at.cfg" else ".accesswidener"}"
 
-if (mcData.isForge) {
-    loom {
+loom {
+    if (mcData.isForge) {
         forge {
             accessTransformer(rootProject.file("src/main/resources/META-INF/$accessTransformerName"))
         }
+    } else {
+        accessWidenerPath = rootProject.file("src/main/resources/META-INF/$accessTransformerName")
     }
 }
 

src/main/java/club/sk1er/patcher/Patcher.java

@@ -1,6 +1,7 @@
 package club.sk1er.patcher;
 
 import club.sk1er.patcher.tweaker.TweakerHooks;
+import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.oneconfig.api.ui.v1.Notifications;
 import org.polyfrost.oneconfig.utils.v1.JsonUtils;
 import org.polyfrost.polyui.unit.Units;
@@ -34,7 +35,6 @@
 import club.sk1er.patcher.util.screenshot.AsyncScreenshots;
 import club.sk1er.patcher.util.status.ProtocolVersionDetector;
 import club.sk1er.patcher.util.world.SavesWatcher;
-import club.sk1er.patcher.util.world.render.culling.EntityCulling;
 import club.sk1er.patcher.util.world.render.entity.EntityRendering;
 import club.sk1er.patcher.util.world.sound.SoundHandler;
 import club.sk1er.patcher.util.world.sound.audioswitcher.AudioSwitcher;
@@ -130,7 +130,7 @@ public void onInit(FMLInitializationEvent event) {
         registerEvents(
             this, soundHandler, dropModifier, audioSwitcher,
             new EntityRendering(), new FovHandler(),
-            new ChatHandler(), new GlanceRenderer(), new EntityCulling(),
+            new ChatHandler(), new GlanceRenderer(),
             new ArmorStatusRenderer(), new PatcherMenuEditor(), new ImagePreview(),
             new TitleFix(), new LinuxKeybindFix(),
             new MetricsRenderer(), new HUDCaching(), new EntityRendererHook(),
@@ -258,7 +258,7 @@ private void registerKeybinds(KeyBinding... keybinds) {
 
     private void registerEvents(Object... events) {
         for (Object event : events) {
-            MinecraftForge.EVENT_BUS.register(event);
+            EventManager.INSTANCE.register(event);
         }
     }
 

src/main/java/club/sk1er/patcher/mixins/bugfixes/SoundManagerMixin_DuplicatedSounds.java

@@ -10,7 +10,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import paulscode.sound.SoundSystem;
 
 import java.util.*;
 
@@ -28,7 +27,7 @@ public abstract class SoundManagerMixin_DuplicatedSounds {
         method = "pauseAllSounds",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/client/audio/SoundManager$SoundSystemStarterThread;pause(Ljava/lang/String;)V", remap = false)
     )
-    private void patcher$onlyPauseSoundIfNecessary(@Coerce SoundSystem soundSystem, String sound) {
+    private void patcher$onlyPauseSoundIfNecessary(@Coerce paulscode.sound.SoundSystem soundSystem, String sound) {
         if (this.isSoundPlaying(this.playingSounds.get(sound))) {
             soundSystem.pause(sound);
             patcher$pausedSounds.add(sound);

src/main/java/club/sk1er/patcher/mixins/features/AbstractClientPlayerMixin_FovModifier.java

@@ -0,0 +1,16 @@
+package club.sk1er.patcher.mixins.features;
+
+import club.sk1er.patcher.util.fov.FovHandler;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(AbstractClientPlayer.class)
+public class AbstractClientPlayerMixin_FovModifier {
+
+    @ModifyReturnValue(method = "getFovModifier", at = @At("RETURN"))
+    private float patcher$modifyFov(float original) {
+        return FovHandler.INSTANCE.onFovChange((AbstractClientPlayer) (Object) this, original);
+    }
+}

src/main/java/club/sk1er/patcher/mixins/features/ChunkRenderDispatcherMixin_LimitUpdates.java

@@ -1,7 +1,6 @@
 package club.sk1er.patcher.mixins.features;
 
 import club.sk1er.patcher.config.PatcherConfig;
-import net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator;
 import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher;
 import net.minecraft.client.renderer.chunk.RenderChunk;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,7 +12,7 @@
 public class ChunkRenderDispatcherMixin_LimitUpdates {
     @SuppressWarnings("BusyWait")
     @Inject(method = "getNextChunkUpdate", at = @At("HEAD"))
-    private void patcher$limitChunkUpdates(CallbackInfoReturnable<ChunkCompileTaskGenerator> cir) throws InterruptedException {
+    private void patcher$limitChunkUpdates(CallbackInfoReturnable<net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator> cir) throws InterruptedException {
         while (PatcherConfig.limitChunks && RenderChunk.renderChunksUpdated >= PatcherConfig.chunkUpdateLimit) {
             Thread.sleep(50L);
         }

src/main/java/club/sk1er/patcher/mixins/features/EntityRendererMixin_FovModifier.java

@@ -0,0 +1,18 @@
+package club.sk1er.patcher.mixins.features;
+
+import club.sk1er.patcher.util.fov.FovHandler;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.EntityRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(EntityRenderer.class)
+public class EntityRendererMixin_FovModifier {
+
+    @ModifyReturnValue(method = "getFOVModifier", at = @At("RETURN"))
+    private float patcher$modifyFov(float original, @Local(ordinal = 0) Block block) {
+        return FovHandler.INSTANCE.onFovModifierChange(block, original);
+    }
+}

src/main/java/club/sk1er/patcher/mixins/features/GuiScreenMixin_BackgroundRendering.java

@@ -5,8 +5,6 @@
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraftforge.client.event.GuiScreenEvent;
-import net.minecraftforge.common.MinecraftForge;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -32,7 +30,10 @@ public class GuiScreenMixin_BackgroundRendering {
             Gui.drawRect(0, 0, this.width, this.height, -1);
             GlStateManager.colorMask(true, true, true, true);
 
-            MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.BackgroundDrawnEvent((GuiScreen) (Object) this));
+            //#if FORGE
+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(
+                new net.minecraftforge.client.event.GuiScreenEvent.BackgroundDrawnEvent((GuiScreen) (Object) this));
+            //#endif
             ci.cancel();
         }
     }

src/main/java/club/sk1er/patcher/mixins/features/RenderItemFrameMixin_CancelRender.java

@@ -1,7 +1,6 @@
 package club.sk1er.patcher.mixins.features;
 
 import club.sk1er.patcher.config.PatcherConfig;
-import club.sk1er.patcher.util.world.render.culling.EntityCulling;
 import net.minecraft.client.renderer.tileentity.RenderItemFrame;
 import net.minecraft.entity.item.EntityItemFrame;
 import net.minecraft.init.Items;
@@ -30,9 +29,5 @@ public class RenderItemFrameMixin_CancelRender {
                 }
             }
         }
-
-        if (EntityCulling.renderItem(entity)) {
-            ci.cancel();
-        }
     }
 }