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

MidnightLib v0.2.2 - Update to 1.17-pre1

Browse Source 
- Not much changed.
- Rough ModMenu port for 1.17-pre1 can be found here: https://github.com/Motschen/ModMenu/releases/tag/v2.0.0-mnd
This commit is contained in:
Motschen
2021-05-28 19:23:40 +02:00
parent 0d20721213
commit 4c965487b1
7 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gradle.properties
View File

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=21w19a minecraft_version=1.17-pre1
yarn_mappings=21w19a+build.9 yarn_mappings=1.17-pre1+build.4
loader_version=0.11.3 loader_version=0.11.3
# Mod Properties # Mod Properties
mod_version = 0.2.1 mod_version = 0.2.2
maven_group = eu.midnightdust maven_group = eu.midnightdust
archives_base_name = midnightlib archives_base_name = midnightlib
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.34.4+1.17 fabric_version=0.34.8+1.17
mod_menu_version = 2.0.0-beta.4 mod_menu_version = 2.0.0-mnd

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

@@ -25,6 +25,6 @@ public class MixinOptionsScreen extends Screen {
@Inject(at = @At("HEAD"),method = "init") @Inject(at = @At("HEAD"),method = "init")
private void midnightlib$init(CallbackInfo ci) { private void midnightlib$init(CallbackInfo ci) {
if (MidnightLibConfig.config_screen_list) if (MidnightLibConfig.config_screen_list)
this.addButton(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib"))); this.addDrawableChild(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
} }
} }

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

@@ -6,6 +6,7 @@ import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.widget.*; import net.minecraft.client.gui.widget.*;
@@ -25,19 +26,16 @@ public class MidnightConfigOverviewScreen extends Screen {
@Override @Override
protected void init() { protected void init() {
super.init(); this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> {
Objects.requireNonNull(client).openScreen(parent);
}));
this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
this.children.add(this.list); this.addSelectableChild(this.list);
MidnightConfig.configClass.forEach((modid, configClass) -> { MidnightConfig.configClass.forEach((modid, configClass) -> {
list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) -> { list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) -> {
Objects.requireNonNull(client).openScreen(MidnightConfig.getScreen(this,modid)); Objects.requireNonNull(client).openScreen(MidnightConfig.getScreen(this,modid));
})); }));
}); });
super.init();
} }
@Override @Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
@@ -45,9 +43,9 @@ public class MidnightConfigOverviewScreen extends Screen {
this.list.render(matrices, mouseX, mouseY, delta); this.list.render(matrices, mouseX, mouseY, delta);
int stringWidth = title.getString().length() + 47; int stringWidth = title.getString().length() + 47;
super.render(matrices, mouseX, mouseY, delta);
if (MidnightConfig.useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27); if (MidnightConfig.useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
super.render(matrices, mouseX, mouseY, delta);
} }
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public static class MidnightOverviewListWidget extends ElementListWidget<OverviewButtonEntry> { public static class MidnightOverviewListWidget extends ElementListWidget<OverviewButtonEntry> {
@@ -61,19 +59,19 @@ public class MidnightConfigOverviewScreen extends Screen {
@Override @Override
public int getScrollbarPositionX() { return this.width -7; } public int getScrollbarPositionX() { return this.width -7; }
public void addButton(AbstractButtonWidget button) { public void addButton(ClickableWidget button) {
this.addEntry(OverviewButtonEntry.create(button)); this.addEntry(OverviewButtonEntry.create(button));
} }
@Override @Override
public int getRowWidth() { return 400; } public int getRowWidth() { return 400; }
} }
public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> { public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> {
private final List<AbstractButtonWidget> buttons = new ArrayList<>(); private final List<ClickableWidget> buttons = new ArrayList<>();
private OverviewButtonEntry(AbstractButtonWidget button) { private OverviewButtonEntry(ClickableWidget button) {
this.buttons.add(button); this.buttons.add(button);
} }
public static OverviewButtonEntry create(AbstractButtonWidget button) { public static OverviewButtonEntry create(ClickableWidget button) {
return new OverviewButtonEntry(button); return new OverviewButtonEntry(button);
} }
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
@@ -85,5 +83,9 @@ public class MidnightConfigOverviewScreen extends Screen {
public List<? extends Element> children() { public List<? extends Element> children() {
return buttons; return buttons;
} }
public List<? extends Selectable> method_37025() {
return buttons;
}
} }
} }

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

@@ -11,6 +11,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.widget.*; import net.minecraft.client.gui.widget.*;
@@ -30,9 +31,11 @@ import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.regex.Pattern; import java.util.regex.Pattern;
// MidnightConfig v1.0.1 // MidnightConfig v1.0.2
// Single class config library - feel free to copy! // Single class config library - feel free to copy!
// Changelog: // Changelog:
// - 1.0.2:
// - Update to 21w20a
// - 1.0.1: // - 1.0.1:
// - Fixed buttons not working in fullscreen // - Fixed buttons not working in fullscreen
// - 1.0.0: // - 1.0.0:
@@ -43,7 +46,7 @@ import java.util.regex.Pattern;
// - Fresh New Design // - Fresh New Design
/** Based on https://github.com/Minenash/TinyConfig /** Based on https://github.com/Minenash/TinyConfig
* Credits to Minenash */ * Credits to Minenash */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class MidnightConfig { public class MidnightConfig {
@@ -200,7 +203,7 @@ public class MidnightConfig {
protected void init() { protected void init() {
super.init(); super.init();
this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> { this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
catch (Exception e) { write(modid); } catch (Exception e) { write(modid); }
@@ -216,7 +219,7 @@ public class MidnightConfig {
Objects.requireNonNull(client).openScreen(parent); Objects.requireNonNull(client).openScreen(parent);
})); }));
ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> { ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
for (EntryInfo info : entries) for (EntryInfo info : entries)
if (info.id.equals(modid)) { if (info.id.equals(modid)) {
try { try {
@@ -228,7 +231,7 @@ public class MidnightConfig {
})); }));
this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
this.children.add(this.list); this.addSelectableChild(this.list);
for (EntryInfo info : entries) { for (EntryInfo info : entries) {
if (info.id.equals(modid)) { if (info.id.equals(modid)) {
TranslatableText name = new TranslatableText(translationPrefix + info.field.getName()); TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
@@ -265,14 +268,13 @@ public class MidnightConfig {
this.list.render(matrices, mouseX, mouseY, delta); this.list.render(matrices, mouseX, mouseY, delta);
int stringWidth = (int) (title.getString().length() * 2.75f); int stringWidth = (int) (title.getString().length() * 2.75f);
super.render(matrices, mouseX, mouseY, delta);
if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27); if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
for (EntryInfo info : entries) { for (EntryInfo info : entries) {
if (info.id.equals(modid)) { if (info.id.equals(modid)) {
if (list.getHoveredButton(mouseX,mouseY).isPresent()) { if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
AbstractButtonWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get(); ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
Text text = ButtonEntry.buttonsWithText.get(buttonWidget); Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName()); TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
String key = translationPrefix + info.field.getName() + ".tooltip"; String key = translationPrefix + info.field.getName() + ".tooltip";
@@ -287,6 +289,7 @@ public class MidnightConfig {
} }
} }
} }
super.render(matrices,mouseX,mouseY,delta);
} }
} }
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
@@ -301,16 +304,16 @@ public class MidnightConfig {
@Override @Override
public int getScrollbarPositionX() { return this.width -7; } public int getScrollbarPositionX() { return this.width -7; }
public void addButton(AbstractButtonWidget button, AbstractButtonWidget resetButton, Text text) { public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
this.addEntry(ButtonEntry.create(button, text, resetButton)); this.addEntry(ButtonEntry.create(button, text, resetButton));
} }
@Override @Override
public int getRowWidth() { return 10000; } public int getRowWidth() { return 10000; }
public Optional<AbstractButtonWidget> getHoveredButton(double mouseX, double mouseY) { public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
for (ButtonEntry buttonEntry : this.children()) { for (ButtonEntry buttonEntry : this.children()) {
for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) { for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
if (abstractButtonWidget.isMouseOver(mouseX, mouseY)) { if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
return Optional.of(abstractButtonWidget); return Optional.of(ClickableWidget);
} }
} }
} }
@@ -319,13 +322,13 @@ public class MidnightConfig {
} }
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> { public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
private final List<AbstractButtonWidget> buttons = new ArrayList<>(); private final List<ClickableWidget> buttons = new ArrayList<>();
private final List<AbstractButtonWidget> resetButtons = new ArrayList<>(); private final List<ClickableWidget> resetButtons = new ArrayList<>();
private final List<Text> texts = new ArrayList<>(); private final List<Text> texts = new ArrayList<>();
private final List<AbstractButtonWidget> buttonsWithResetButtons = new ArrayList<>(); private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
public static final Map<AbstractButtonWidget, Text> buttonsWithText = new HashMap<>(); public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
private ButtonEntry(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) { private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
buttonsWithText.put(button,text); buttonsWithText.put(button,text);
this.buttons.add(button); this.buttons.add(button);
this.resetButtons.add(resetButton); this.resetButtons.add(resetButton);
@@ -333,15 +336,15 @@ public class MidnightConfig {
this.buttonsWithResetButtons.add(button); this.buttonsWithResetButtons.add(button);
this.buttonsWithResetButtons.add(resetButton); this.buttonsWithResetButtons.add(resetButton);
} }
public static ButtonEntry create(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) { public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
return new ButtonEntry(button, text, resetButton); return new ButtonEntry(button, text, resetButton);
} }
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
this.buttons.forEach((button) -> { this.buttons.forEach(button -> {
button.y = y; button.y = y;
button.render(matrices, mouseX, mouseY, tickDelta); button.render(matrices, mouseX, mouseY, tickDelta);
}); });
this.texts.forEach((text) -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF)); this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
this.resetButtons.forEach((button) -> { this.resetButtons.forEach((button) -> {
button.y = y; button.y = y;
button.render(matrices, mouseX, mouseY, tickDelta); button.render(matrices, mouseX, mouseY, tickDelta);
@@ -350,6 +353,10 @@ public class MidnightConfig {
public List<? extends Element> children() { public List<? extends Element> children() {
return buttonsWithResetButtons; return buttonsWithResetButtons;
} }
public List<? extends Selectable> method_37025() {
return buttonsWithResetButtons;
}
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

2
src/main/resources/fabric.mod.json
View File

@@ -34,7 +34,7 @@
], ],
"depends": { "depends": {
"fabric": "*" "fabric-renderer-registries-v1": "*"
}, },
"custom": { "custom": {

2
src/main/resources/midnightcore.mixins.json
View File

@@ -1,7 +1,7 @@
{ {
"required": true, "required": true,
"package": "eu.midnightdust.core.mixin", "package": "eu.midnightdust.core.mixin",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_16",
"client": [ "client": [
"MixinOptionsScreen" "MixinOptionsScreen"
], ],

2
src/main/resources/midnighthats.mixins.json
View File

@@ -1,7 +1,7 @@
{ {
"required": true, "required": true,
"package": "eu.midnightdust.hats.mixin", "package": "eu.midnightdust.hats.mixin",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_16",
"client": [ "client": [
"PlayerEntityRendererMixin" "PlayerEntityRendererMixin"
], ],