Motschen/MidnightLib
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightLib.git synced 2025-12-16 09:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: support NeoForge on 1.21.9

Browse Source 
`@Environment` annotations had to be removed because NeoForge doesn't like them. Also, this brings down file size :)
This commit is contained in:
Martin Prokoph
2025-10-01 17:50:18 +02:00
parent 72a403080c
commit 98859fbc28
10 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/eu/midnightdust/core/MidnightLib.java
View File

@@ -3,8 +3,6 @@ package eu.midnightdust.core;
import eu.midnightdust.core.config.MidnightLibConfig;
import eu.midnightdust.lib.config.AutoCommand;
import eu.midnightdust.lib.config.MidnightConfig;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.util.Util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +17,6 @@ public class MidnightLib {
public static final String MOD_ID = "midnightlib";
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
@Environment(EnvType.CLIENT)
public static void onInitializeClient() {
try {
if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) {

3
common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java
View File

@@ -2,8 +2,6 @@ package eu.midnightdust.core.screen;
import eu.midnightdust.core.MidnightLib;
import eu.midnightdust.lib.config.MidnightConfig;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@@ -17,7 +15,6 @@ import java.util.Objects;
import eu.midnightdust.lib.config.MidnightConfigListWidget;
@Environment(EnvType.CLIENT)
public class MidnightConfigOverviewScreen extends Screen {
public MidnightConfigOverviewScreen(Screen parent) {

5
common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
View File

@@ -3,8 +3,6 @@ package eu.midnightdust.lib.config;
import com.google.gson.*;
import com.google.gson.stream.*;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.*;
import net.minecraft.client.resource.language.I18n;
@@ -83,7 +81,6 @@ public abstract class MidnightConfig {
instance.loadValuesFromJson();
}
@Environment(EnvType.CLIENT)
public void addClientEntry(Field field, EntryInfo info) {
Entry e = info.entry;
if (e != null && info.dataType != null) {
@@ -215,11 +212,9 @@ public abstract class MidnightConfig {
public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
}
@Environment(EnvType.CLIENT)
public static Screen getScreen(Screen parent, String modid) {
return configInstances.get(modid).getScreen(parent);
}
@Environment(EnvType.CLIENT)
public Screen getScreen(Screen parent) {
return new MidnightConfigScreen(parent, modid);
}

3
common/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java
View File

@@ -1,7 +1,5 @@
package eu.midnightdust.lib.config;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.RenderPipelines;
import net.minecraft.client.gui.DrawContext;
@@ -12,7 +10,6 @@ import net.minecraft.text.Text;
import java.util.List;
@Environment(EnvType.CLIENT)
public class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
public boolean renderHeaderSeparator = true;

3
common/src/main/java/eu/midnightdust/lib/config/MidnightConfigScreen.java
View File

@@ -1,8 +1,6 @@
package eu.midnightdust.lib.config;
import com.google.common.collect.Lists;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.tab.GridScreenTab;
@@ -28,7 +26,6 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
@Environment(EnvType.CLIENT)
public class MidnightConfigScreen extends Screen {
public MidnightConfig instance;
public final String translationPrefix, modid;