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

MidnightLib 1.5.2 - NeoForge & more cleanness

Browse Source 
- Native support for NeoForge (& dropped support for regular Forge)
- Cleanup of some code -> Overview button is now added via callbacks instead of a mixin
- Unify client & server classes
  - Minor breaking change only affecting mods using the hiding functionality
This commit is contained in:
Martin Prokoph
2023-12-11 19:28:04 +01:00
parent 29c8a9ccfe
commit fb1c4c1158
25 changed files with 135 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/eu/midnightdust/core/MidnightLibServer.java → common/src/main/java/eu/midnightdust/core/MidnightLib.java
View File

@@ -1,12 +1,23 @@
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 java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
public class MidnightLibServer {
public class MidnightLib {
public static List<String> hiddenMods = new ArrayList<>();
@Environment(EnvType.CLIENT)
public static void onInitializeClient() {
MidnightLibConfig.init("midnightlib", MidnightLibConfig.class);
}
@Environment(EnvType.SERVER)
public static void onInitializeServer() {
MidnightConfig.configClass.forEach((modid, config) -> {
for (Field field : config.getFields()) {

14
common/src/main/java/eu/midnightdust/core/MidnightLibClient.java
View File

@@ -1,14 +0,0 @@
package eu.midnightdust.core;
import eu.midnightdust.core.config.MidnightLibConfig;
import java.util.ArrayList;
import java.util.List;
public class MidnightLibClient {
public static List<String> hiddenMods = new ArrayList<>();
public static void onInitializeClient() {
MidnightLibConfig.init("midnightlib", MidnightLibConfig.class);
}
}

34
common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java
View File

@@ -1,34 +0,0 @@
package eu.midnightdust.core.mixin;
import eu.midnightdust.core.config.MidnightLibConfig;
import eu.midnightdust.core.screen.MidnightConfigOverviewScreen;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.option.OptionsScreen;
import net.minecraft.client.gui.widget.TextIconButtonWidget;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Objects;
@Mixin(OptionsScreen.class)
public class MixinOptionsScreen extends Screen {
protected MixinOptionsScreen(Text title) {
super(title);
}
@Inject(at = @At("HEAD"),method = "init")
private void midnightlib$init(CallbackInfo ci) {
if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"))) {
TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightlib.overview.title"), (
buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), true)
.texture(new Identifier("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build();
button.setPosition(this.width / 2 + 158, this.height / 6 - 12);
this.addDrawableChild(button);
}
}
}

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

@@ -1,14 +1,20 @@
package eu.midnightdust.core.screen;
import eu.midnightdust.core.MidnightLibClient;
import eu.midnightdust.core.MidnightLib;
import eu.midnightdust.core.config.MidnightLibConfig;
import eu.midnightdust.lib.config.MidnightConfig;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.option.OptionsScreen;
import net.minecraft.client.gui.widget.*;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.*;
import net.minecraft.util.Identifier;
import java.util.*;
@Environment(EnvType.CLIENT)
@@ -31,7 +37,7 @@ public class MidnightConfigOverviewScreen extends Screen {
List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
Collections.sort(sortedMods);
sortedMods.forEach((modid) -> {
if (!MidnightLibClient.hiddenMods.contains(modid)) {
if (!MidnightLib.hiddenMods.contains(modid)) {
list.addButton(List.of(ButtonWidget.builder(Text.translatable(modid +".midnightconfig.title"), (button) ->
Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))).dimensions(this.width / 2 - 125, this.height - 28, 250, 20).build()), null, null);
}
@@ -47,4 +53,15 @@ public class MidnightConfigOverviewScreen extends Screen {
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xFFFFFF);
}
@Override public void renderBackground(DrawContext c, int x, int y, float d) {}
public static void addButtonToOptionsScreen(Screen screen, MinecraftClient client) {
if (screen.getClass() == OptionsScreen.class && MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE)
|| (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"))) {
TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightlib.overview.title"), (
buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(screen)), true)
.texture(new Identifier("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build();
button.setPosition(screen.width / 2 + 158, screen.height / 6 - 12);
screen.addDrawableChild(button);
}
}
}

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

@@ -194,7 +194,7 @@ public abstract class MidnightConfig {
if (!Files.exists(path)) Files.createFile(path);
Files.write(path, gson.toJson(getClass(modid)).getBytes());
} catch (Exception e) {
e.printStackTrace();
e.fillInStackTrace();
}
}
@Environment(EnvType.CLIENT)

4
common/src/main/resources/architectury.common.json
View File

@@ -1 +1,3 @@
{}
{
"accessWidener": "midnightlib.accesswidener"
}

3
common/src/main/resources/midnightlib.accesswidener Normal file
View File

@@ -0,0 +1,3 @@
accessWidener v2 named
accessible method net/minecraft/client/gui/screen/Screen addDrawableChild (Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;

1
common/src/main/resources/midnightlib.mixins.json
View File

@@ -1 +0,0 @@
{"required": true,"minVersion": "0.8","package": "eu.midnightdust.core.mixin","compatibilityLevel": "JAVA_17","client": ["MixinOptionsScreen"],"injectors": {"defaultRequire": 1}}