mirror of
https://github.com/PuzzleMC/Puzzle.git
synced 2025-12-16 03:45:10 +01:00
Puzzle 0.3.0 - 1.17
Modulized into: puzzle-base (update checker + config) puzzle-gui (unified config gui) puzzle-models (remove limitations) puzzle-blocks (custom render layers) puzzle-splashscreen (resourcepack-provided spash screen) Updated to 1.17
This commit is contained in:
3
puzzle-base/build.gradle
Executable file
3
puzzle-base/build.gradle
Executable file
@@ -0,0 +1,3 @@
|
||||
archivesBaseName = "puzzle-base"
|
||||
dependencies {
|
||||
}
|
||||
376
puzzle-base/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
Executable file
376
puzzle-base/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
Executable file
@@ -0,0 +1,376 @@
|
||||
package eu.midnightdust.lib.config;
|
||||
|
||||
import com.google.gson.ExclusionStrategy;
|
||||
import com.google.gson.FieldAttributes;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.font.TextRenderer;
|
||||
import net.minecraft.client.gui.DrawableHelper;
|
||||
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.ScreenTexts;
|
||||
import net.minecraft.client.gui.widget.*;
|
||||
import net.minecraft.client.resource.language.I18n;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.*;
|
||||
import net.minecraft.util.Formatting;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.*;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
// MidnightConfig v1.0.2
|
||||
// Single class config library - feel free to copy!
|
||||
// Changelog:
|
||||
// - 1.0.2:
|
||||
// - Update to 21w20a
|
||||
// - 1.0.1:
|
||||
// - Fixed buttons not working in fullscreen
|
||||
// - 1.0.0:
|
||||
// - The config screen no longer shows the entries of all instances of MidnightConfig
|
||||
// - Compatible with servers!
|
||||
// - Scrollable!
|
||||
// - Comment support!
|
||||
// - Fresh New Design
|
||||
|
||||
/** Based on https://github.com/Minenash/TinyConfig
|
||||
* Credits to Minenash */
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public class MidnightConfig {
|
||||
public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text
|
||||
|
||||
private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
|
||||
private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
|
||||
|
||||
private static final List<EntryInfo> entries = new ArrayList<>();
|
||||
|
||||
protected static class EntryInfo {
|
||||
Field field;
|
||||
Object widget;
|
||||
int width;
|
||||
Map.Entry<TextFieldWidget,Text> error;
|
||||
Object defaultValue;
|
||||
Object value;
|
||||
String tempValue;
|
||||
boolean inLimits = true;
|
||||
String id;
|
||||
}
|
||||
|
||||
public static final Map<String,Class<?>> configClass = new HashMap<>();
|
||||
private static Path path;
|
||||
|
||||
private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
|
||||
|
||||
public static void init(String modid, Class<?> config) {
|
||||
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
|
||||
configClass.put(modid, config);
|
||||
|
||||
for (Field field : config.getFields()) {
|
||||
EntryInfo info = new EntryInfo();
|
||||
if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
|
||||
try {
|
||||
initClient(modid, field, info);
|
||||
} catch (Exception e) {continue;}
|
||||
if (field.isAnnotationPresent(Entry.class))
|
||||
try {
|
||||
info.defaultValue = field.get(null);
|
||||
} catch (IllegalAccessException ignored) {}
|
||||
}
|
||||
try { gson.fromJson(Files.newBufferedReader(path), config); }
|
||||
catch (Exception e) { write(modid); }
|
||||
|
||||
for (EntryInfo info : entries) {
|
||||
if (info.field.isAnnotationPresent(Entry.class))
|
||||
try {
|
||||
info.value = info.field.get(null);
|
||||
info.tempValue = info.value.toString();
|
||||
} catch (IllegalAccessException ignored) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@Environment(EnvType.CLIENT)
|
||||
public static void initClient(String modid, Field field, EntryInfo info) {
|
||||
Class<?> type = field.getType();
|
||||
Entry e = field.getAnnotation(Entry.class);
|
||||
info.width = e != null ? e.width() : 0;
|
||||
info.field = field;
|
||||
info.id = modid;
|
||||
|
||||
if (e != null)
|
||||
if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
|
||||
else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
|
||||
else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
|
||||
else if (type == boolean.class) {
|
||||
Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
|
||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
||||
info.value = !(Boolean) info.value;
|
||||
button.setMessage(func.apply(info.value));
|
||||
}, func);
|
||||
} else if (type.isEnum()) {
|
||||
List<?> values = Arrays.asList(field.getType().getEnumConstants());
|
||||
Function<Object,Text> func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
|
||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
|
||||
int index = values.indexOf(info.value) + 1;
|
||||
info.value = values.get(index >= values.size()? 0 : index);
|
||||
button.setMessage(func.apply(info.value));
|
||||
}, func);
|
||||
}
|
||||
entries.add(info);
|
||||
}
|
||||
|
||||
private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
|
||||
boolean isNumber = pattern != null;
|
||||
info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
|
||||
s = s.trim();
|
||||
if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches())) return false;
|
||||
|
||||
Number value = 0;
|
||||
boolean inLimits = false;
|
||||
System.out.println(((isNumber ^ s.isEmpty())));
|
||||
System.out.println(!s.equals("-") && !s.equals("."));
|
||||
info.error = null;
|
||||
if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
|
||||
value = f.apply(s);
|
||||
inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
|
||||
info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
|
||||
"§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
|
||||
"§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
|
||||
}
|
||||
|
||||
info.tempValue = s;
|
||||
t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
|
||||
info.inLimits = inLimits;
|
||||
b.active = entries.stream().allMatch(e -> e.inLimits);
|
||||
|
||||
if (inLimits)
|
||||
info.value = isNumber? value : s;
|
||||
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
||||
public static void write(String modid) {
|
||||
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
|
||||
try {
|
||||
if (!Files.exists(path)) Files.createFile(path);
|
||||
Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public static Screen getScreen(Screen parent, String modid) {
|
||||
return new TinyConfigScreen(parent, modid);
|
||||
}
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
private static class TinyConfigScreen extends Screen {
|
||||
|
||||
protected TinyConfigScreen(Screen parent, String modid) {
|
||||
super(new TranslatableText(modid + ".midnightconfig." + "title"));
|
||||
this.parent = parent;
|
||||
this.modid = modid;
|
||||
this.translationPrefix = modid + ".midnightconfig.";
|
||||
}
|
||||
private final String translationPrefix;
|
||||
private final Screen parent;
|
||||
private final String modid;
|
||||
private MidnightConfigListWidget list;
|
||||
|
||||
// Real Time config update //
|
||||
@Override
|
||||
public void tick() {
|
||||
for (EntryInfo info : entries)
|
||||
try { info.field.set(null, info.value); }
|
||||
catch (IllegalAccessException ignored) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void init() {
|
||||
super.init();
|
||||
|
||||
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)); }
|
||||
catch (Exception e) { write(modid); }
|
||||
|
||||
for (EntryInfo info : entries) {
|
||||
if (info.field.isAnnotationPresent(Entry.class)) {
|
||||
try {
|
||||
info.value = info.field.get(null);
|
||||
info.tempValue = info.value.toString();
|
||||
} catch (IllegalAccessException ignored) {
|
||||
}
|
||||
}
|
||||
}
|
||||
Objects.requireNonNull(client).openScreen(parent);
|
||||
}));
|
||||
|
||||
ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
|
||||
for (EntryInfo info : entries)
|
||||
if (info.id.equals(modid)) {
|
||||
try {
|
||||
info.field.set(null, info.value);
|
||||
} catch (IllegalAccessException ignored) {}
|
||||
}
|
||||
write(modid);
|
||||
Objects.requireNonNull(client).openScreen(parent);
|
||||
}));
|
||||
|
||||
this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
||||
this.addSelectableChild(this.list);
|
||||
for (EntryInfo info : entries) {
|
||||
if (info.id.equals(modid)) {
|
||||
TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
|
||||
ButtonWidget resetButton = new ButtonWidget(width - 155, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
|
||||
info.value = info.defaultValue;
|
||||
info.tempValue = info.value.toString();
|
||||
double scrollAmount = list.getScrollAmount();
|
||||
Objects.requireNonNull(client).openScreen(this);
|
||||
list.setScrollAmount(scrollAmount);
|
||||
}));
|
||||
|
||||
if (info.widget instanceof Map.Entry) {
|
||||
Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
|
||||
if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
|
||||
this.list.addButton(new ButtonWidget(width - 110, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
|
||||
} else if (info.widget != null) {
|
||||
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, info.width, 20, null);
|
||||
|
||||
widget.setText(info.tempValue);
|
||||
Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
|
||||
widget.setTextPredicate(processor);
|
||||
this.list.addButton(widget, resetButton, name);
|
||||
} else {
|
||||
ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null);
|
||||
this.list.addButton(dummy,dummy,name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@Override
|
||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
||||
this.renderBackground(matrices);
|
||||
this.list.render(matrices, mouseX, mouseY, delta);
|
||||
|
||||
int stringWidth = (int) (title.getString().length() * 2.75f);
|
||||
if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
|
||||
else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
|
||||
|
||||
for (EntryInfo info : entries) {
|
||||
if (info.id.equals(modid)) {
|
||||
if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
|
||||
ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
|
||||
Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
|
||||
TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
|
||||
String key = translationPrefix + info.field.getName() + ".tooltip";
|
||||
|
||||
if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
|
||||
else if (I18n.hasTranslation(key) && text.equals(name)) {
|
||||
List<Text> list = new ArrayList<>();
|
||||
for (String str : I18n.translate(key).split("\n"))
|
||||
list.add(new LiteralText(str));
|
||||
renderTooltip(matrices, list, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
super.render(matrices,mouseX,mouseY,delta);
|
||||
}
|
||||
}
|
||||
@Environment(EnvType.CLIENT)
|
||||
public static class MidnightConfigListWidget extends ElementListWidget<MidnightConfig.ButtonEntry> {
|
||||
TextRenderer textRenderer;
|
||||
|
||||
public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
|
||||
super(minecraftClient, i, j, k, l, m);
|
||||
this.centerListVertically = false;
|
||||
textRenderer = minecraftClient.textRenderer;
|
||||
}
|
||||
@Override
|
||||
public int getScrollbarPositionX() { return this.width -7; }
|
||||
|
||||
public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
|
||||
this.addEntry(ButtonEntry.create(button, text, resetButton));
|
||||
}
|
||||
@Override
|
||||
public int getRowWidth() { return 10000; }
|
||||
public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
|
||||
for (ButtonEntry buttonEntry : this.children()) {
|
||||
for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
|
||||
if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
|
||||
return Optional.of(ClickableWidget);
|
||||
}
|
||||
}
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
|
||||
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
||||
private final List<ClickableWidget> buttons = new ArrayList<>();
|
||||
private final List<ClickableWidget> resetButtons = new ArrayList<>();
|
||||
private final List<Text> texts = new ArrayList<>();
|
||||
private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
|
||||
public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
|
||||
|
||||
private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
|
||||
buttonsWithText.put(button,text);
|
||||
this.buttons.add(button);
|
||||
this.resetButtons.add(resetButton);
|
||||
this.texts.add(text);
|
||||
this.buttonsWithResetButtons.add(button);
|
||||
this.buttonsWithResetButtons.add(resetButton);
|
||||
}
|
||||
public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget 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) {
|
||||
this.buttons.forEach(button -> {
|
||||
button.y = y;
|
||||
button.render(matrices, mouseX, mouseY, tickDelta);
|
||||
});
|
||||
this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
|
||||
this.resetButtons.forEach((button) -> {
|
||||
button.y = y;
|
||||
button.render(matrices, mouseX, mouseY, tickDelta);
|
||||
});
|
||||
}
|
||||
public List<? extends Element> children() {
|
||||
return buttonsWithResetButtons;
|
||||
}
|
||||
|
||||
public List<? extends Selectable> method_37025() {
|
||||
return buttonsWithResetButtons;
|
||||
}
|
||||
}
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.FIELD)
|
||||
public @interface Entry {
|
||||
int width() default 100;
|
||||
double min() default Double.MIN_NORMAL;
|
||||
double max() default Double.MAX_VALUE;
|
||||
}
|
||||
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
|
||||
|
||||
public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
|
||||
public boolean shouldSkipClass(Class<?> clazz) { return false; }
|
||||
public boolean shouldSkipField(FieldAttributes fieldAttributes) {
|
||||
return fieldAttributes.getAnnotation(Entry.class) == null;
|
||||
}
|
||||
}
|
||||
}
|
||||
22
puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java
Executable file
22
puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java
Executable file
@@ -0,0 +1,22 @@
|
||||
package net.puzzlemc.core;
|
||||
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.core.util.UpdateChecker;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
|
||||
public class PuzzleCore implements ClientModInitializer {
|
||||
|
||||
public final static String version = "Puzzle A1";
|
||||
public final static String name = "Puzzle";
|
||||
public final static String id = "puzzle";
|
||||
public final static String website = "https://github.com/TeamMidnightDust/Puzzle";
|
||||
public static String updateURL = website + "download";
|
||||
|
||||
public final static String UPDATE_URL = "https://raw.githubusercontent.com/TeamMidnightDust/Puzzle/main/puzzle_versions.json";
|
||||
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
PuzzleConfig.init(id, PuzzleConfig.class);
|
||||
if (PuzzleConfig.checkUpdates) UpdateChecker.init();
|
||||
}
|
||||
}
|
||||
19
puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
Executable file
19
puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
Executable file
@@ -0,0 +1,19 @@
|
||||
package net.puzzlemc.core.config;
|
||||
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
|
||||
public class PuzzleConfig extends MidnightConfig {
|
||||
@Entry public static boolean debugMessages = false;
|
||||
|
||||
@Entry public static boolean checkUpdates = true;
|
||||
@Entry public static boolean showPuzzleInfo = true;
|
||||
@Entry public static boolean resourcepackSplashScreen = true;
|
||||
@Entry public static boolean randomEntityTextures = true;
|
||||
@Entry public static boolean customRenderLayers = true;
|
||||
@Entry public static boolean unlimitedRotations = true;
|
||||
@Entry public static boolean biggerModels = true;
|
||||
|
||||
@Entry public static int backgroundColor = 15675965;
|
||||
@Entry public static int progressBarColor = 16777215;
|
||||
@Entry public static int progressFrameColor = 16777215;
|
||||
}
|
||||
38
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
Executable file
38
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
Executable file
@@ -0,0 +1,38 @@
|
||||
package net.puzzlemc.core.mixin;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlDebugInfo;
|
||||
import net.puzzlemc.core.PuzzleCore;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.core.util.UpdateChecker;
|
||||
import net.minecraft.client.gui.DrawableHelper;
|
||||
import net.minecraft.client.gui.hud.DebugHud;
|
||||
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.CallbackInfoReturnable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(DebugHud.class)
|
||||
public class MixinDebugHud extends DrawableHelper {
|
||||
@Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
|
||||
private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
|
||||
if (PuzzleConfig.showPuzzleInfo) {
|
||||
List<String> entries = cir.getReturnValue();
|
||||
String message;
|
||||
if (UpdateChecker.isUpToDate) {
|
||||
message = "Puzzle is up to date (" + PuzzleCore.version + ")";
|
||||
} else {
|
||||
message = "Puzzle is outdated (" + PuzzleCore.version + " -> " + UpdateChecker.latestVersion + ")";
|
||||
}
|
||||
for (int i = 0; i < entries.size(); i++) {
|
||||
String str = entries.get(i);
|
||||
|
||||
if (str.startsWith(GlDebugInfo.getVersion())) {
|
||||
entries.add(i + 1, message);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
75
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
Executable file
75
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
Executable file
@@ -0,0 +1,75 @@
|
||||
package net.puzzlemc.core.mixin;
|
||||
|
||||
import net.puzzlemc.core.PuzzleCore;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.core.util.UpdateChecker;
|
||||
import net.minecraft.client.gui.screen.*;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
@Mixin(TitleScreen.class)
|
||||
public class MixinTitleScreen extends Screen {
|
||||
|
||||
@Shadow @Final private boolean doBackgroundFade;
|
||||
@Shadow private long backgroundFadeStart;
|
||||
private Text puzzleText;
|
||||
private int puzzleTextWidth;
|
||||
|
||||
protected MixinTitleScreen(Text title) {
|
||||
super(title);
|
||||
}
|
||||
@Inject(at = @At("TAIL"), method = "init")
|
||||
private void puzzle$init(CallbackInfo ci) {
|
||||
if (UpdateChecker.isUpToDate) {
|
||||
puzzleText = Text.of(PuzzleCore.version);
|
||||
}
|
||||
else {
|
||||
puzzleText = new TranslatableText("").append(Text.of(PuzzleCore.version + " | ")).append(new TranslatableText("puzzle.text.update_available"));
|
||||
this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("TAIL"), method = "render")
|
||||
private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||
if (PuzzleConfig.showPuzzleInfo) {
|
||||
float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
|
||||
float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
|
||||
int l = MathHelper.ceil(g * 255.0F) << 24;
|
||||
textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - 20, 16777215 | l);
|
||||
if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - 20 && mouseY < this.height - 10) {
|
||||
fill(matrices, 2, this.height - 11, 2 + this.puzzleTextWidth, this.height-10, 16777215 | l);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void confirmLink(boolean open) {
|
||||
if (open) {
|
||||
Util.getOperatingSystem().open(PuzzleCore.updateURL);
|
||||
}
|
||||
Objects.requireNonNull(this.client).openScreen(this);
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
|
||||
private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
|
||||
if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - 20) && mouseY < (double)this.height-10) {
|
||||
if (Objects.requireNonNull(this.client).options.chatLinksPrompt) {
|
||||
this.client.openScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
|
||||
} else {
|
||||
Util.getOperatingSystem().open(PuzzleCore.updateURL);
|
||||
}
|
||||
cir.setReturnValue(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
17
puzzle-base/src/main/java/net/puzzlemc/core/util/ColorUtil.java
Executable file
17
puzzle-base/src/main/java/net/puzzlemc/core/util/ColorUtil.java
Executable file
@@ -0,0 +1,17 @@
|
||||
package net.puzzlemc.core.util;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
public class ColorUtil {
|
||||
/**
|
||||
* @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
|
||||
* @param colorStr e.g. "FFFFFF"
|
||||
* @return
|
||||
*/
|
||||
public static Color hex2Rgb(String colorStr) {
|
||||
return new Color(
|
||||
Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
|
||||
Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
|
||||
Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
|
||||
}
|
||||
}
|
||||
55
puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java
Executable file
55
puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java
Executable file
@@ -0,0 +1,55 @@
|
||||
package net.puzzlemc.core.util;
|
||||
|
||||
import com.google.common.reflect.TypeToken;
|
||||
import com.google.gson.Gson;
|
||||
import net.puzzlemc.core.PuzzleCore;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
import java.lang.reflect.Type;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
|
||||
public class UpdateChecker {
|
||||
private static final Gson GSON = new Gson();
|
||||
private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
|
||||
public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
|
||||
|
||||
public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
|
||||
public static String latestVersion;
|
||||
public static boolean isUpToDate = true;
|
||||
|
||||
public static void init() {
|
||||
CompletableFuture.supplyAsync(() -> {
|
||||
try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_URL).openStream())) {
|
||||
return GSON.<Map<String, String>>fromJson(reader, UPDATE_TYPE_TOKEN);
|
||||
} catch (MalformedURLException error) {
|
||||
logger.log(Level.ERROR, "Unable to check for updates because of connection problems: " + error.getMessage());
|
||||
} catch (IOException error) {
|
||||
logger.log(Level.ERROR, "Unable to check for updates because of an I/O Exception: " + error.getMessage());
|
||||
}
|
||||
|
||||
return null;
|
||||
}).thenAcceptAsync(versionMap -> {
|
||||
if (versionMap != null && versionMap.containsKey(minecraftVersion)) {
|
||||
latestVersion = versionMap.get(minecraftVersion);
|
||||
if (!latestVersion.equals(minecraftVersion)) {
|
||||
isUpToDate = false;
|
||||
PuzzleCore.updateURL = PuzzleCore.website + "download/" + latestVersion.replace(PuzzleCore.name + " ","");
|
||||
logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
|
||||
logger.log(Level.INFO, "Please update immediately!");
|
||||
}
|
||||
} else {
|
||||
logger.log(Level.WARN, "A problem with the database occured, could not check for updates.");
|
||||
}
|
||||
}, MinecraftClient.getInstance());
|
||||
}
|
||||
}
|
||||
BIN
puzzle-base/src/main/resources/assets/puzzle/icon.png
Executable file
BIN
puzzle-base/src/main/resources/assets/puzzle/icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
17
puzzle-base/src/main/resources/assets/puzzle/lang/en_us.json
Executable file
17
puzzle-base/src/main/resources/assets/puzzle/lang/en_us.json
Executable file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"puzzle.text.update_available":"An update is available!",
|
||||
"puzzle.screen.title":"Puzzle Settings",
|
||||
"puzzle.page.graphics":"Graphics Settings",
|
||||
"puzzle.page.resources":"Resource Settings",
|
||||
"puzzle.page.performance":"Performance Settings",
|
||||
"puzzle.page.misc":"Miscellaneous Settings",
|
||||
"puzzle.option.ctm":"Connected Textures",
|
||||
"puzzle.option.inside_ctm":"Connect Inside Textures",
|
||||
"puzzle.midnightconfig.title":"Title",
|
||||
"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
|
||||
"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
|
||||
"test.midnightconfig.title":"I am a title",
|
||||
"test.midnightconfig.text":"I am a comment *u*",
|
||||
"test.midnightconfig.showInfo":"Show Info",
|
||||
"test.midnightconfig.showInfo.tooltip":"Show more information"
|
||||
}
|
||||
40
puzzle-base/src/main/resources/fabric.mod.json
Executable file
40
puzzle-base/src/main/resources/fabric.mod.json
Executable file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "puzzle-base",
|
||||
"version": "${version}",
|
||||
|
||||
"name": "Puzzle",
|
||||
"description": "Unites optifine replacement mods in a clean & vanilla-style gui",
|
||||
"authors": [
|
||||
"Motschen",
|
||||
"TeamMidnightDust"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://www.midnightdust.eu/",
|
||||
"sources": "https://github.com/TeamMidnightDust/Puzzle",
|
||||
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
|
||||
},
|
||||
|
||||
"license": "MIT",
|
||||
"icon": "assets/puzzle/icon.png",
|
||||
|
||||
"environment": "client",
|
||||
"entrypoints": {
|
||||
"client": [
|
||||
"net.puzzlemc.core.PuzzleCore"
|
||||
]
|
||||
},
|
||||
"custom": {
|
||||
"modmenu": {
|
||||
"parent": "puzzle-core"
|
||||
}
|
||||
},
|
||||
|
||||
"mixins": [
|
||||
"puzzle-base.mixins.json"
|
||||
],
|
||||
|
||||
"depends": {
|
||||
"fabric": "*"
|
||||
}
|
||||
}
|
||||
12
puzzle-base/src/main/resources/puzzle-base.mixins.json
Executable file
12
puzzle-base/src/main/resources/puzzle-base.mixins.json
Executable file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"required": true,
|
||||
"package": "net.puzzlemc.core.mixin",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"client": [
|
||||
"MixinTitleScreen",
|
||||
"MixinDebugHud"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user