version 1.18

someaddons · Dec 3, 2021 · e1c3f09 · e1c3f09
1 parent d7172cd
commit e1c3f09
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ version = "${mc_version}-${mod_version}"
 group = "com.${modid}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "${modid}"
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
     mappings channel: mappings_channel, version: mappings_version
@@ -94,7 +94,7 @@ mixin {
 dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" //21
 
-    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G -Djava.net.preferIPv4Stack=true
 org.gradle.daemon=false
 mod_version=1.1
 modid=betterfpsdist
-mc_version=1.17.1
-forge_version=37.0.61
-mappings_version=1.17.1
+mc_version=1.18
+forge_version=38.0.12
+mappings_version=1.18
 mappings_channel=official
diff --git a/src/main/java/com/betterfpsdist/event/ClientEventHandler.java b/src/main/java/com/betterfpsdist/event/ClientEventHandler.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.ProgressOption;
 import net.minecraft.client.gui.screens.VideoSettingsScreen;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.client.event.ScreenOpenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.ArrayList;
@@ -38,7 +38,7 @@ public class ClientEventHandler
         }
     }
     @SubscribeEvent
-    public static void on(GuiOpenEvent event)
+    public static void on(ScreenOpenEvent event)
     {
         if (event.isCanceled())
         {

diff --git a/src/main/java/com/betterfpsdist/mixin/LevelRendererMixin.java b/src/main/java/com/betterfpsdist/mixin/LevelRendererMixin.java
@@ -33,15 +33,14 @@ public ChunkRenderDispatcher.CompiledChunk on(final ChunkRenderDispatcher.Render
     public boolean on(final ChunkRenderDispatcher.CompiledChunk instance, final RenderType type)
     {
         boolean returnv =
-          minecraft.cameraEntity != null &&
-            distSqr(minecraft.cameraEntity.position(), new Vec3(current.getOrigin().getX(), current.getOrigin().getY(), current.getOrigin().getZ()))
-              > (Minecraft.getInstance().options.renderDistance * 16) * (Minecraft.getInstance().options.renderDistance * 16)
+          minecraft.cameraEntity != null && distSqr(minecraft.cameraEntity.position(), new Vec3(current.getOrigin().getX(), current.getOrigin().getY(), current.getOrigin().getZ()))
+                                              > (Minecraft.getInstance().options.renderDistance * 16) * (Minecraft.getInstance().options.renderDistance * 16)
             || instance.isEmpty(type);
 
-        /*
+/*
         if (Minecraft.getInstance().player.level.getGameTime() > nextUpdate)
         {
-            nextUpdate = Minecraft.getInstance().player.level.getGameTime() + 20 * 60;
+            nextUpdate = Minecraft.getInstance().player.level.getGameTime() + 20 * 5;
             BetterfpsdistMod.LOGGER.warn("Rendered Sections:" + renderedPositions.size());
             renderedPositions.clear();
         }

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -53,6 +53,6 @@ betterfpsdist mod
     modId="minecraft"
     mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[1.17,1.18)"
+    versionRange="[1.18,1.19)"
     ordering="NONE"
     side="BOTH"
diff --git a/src/main/resources/betterfpsdist.mixins.json b/src/main/resources/betterfpsdist.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": false,
   "package": "com.betterfpsdist.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "refmap": "betterfpsdist.refmap.json",
   "mixins": [
   ],