some changes i dont remember
This commit is contained in:
parent
fb7a320d02
commit
c2d643ae95
|
@ -78,3 +78,7 @@ publishing {
|
|||
// retrieving dependencies.
|
||||
}
|
||||
}
|
||||
|
||||
loom {
|
||||
log4jConfigs.from(file("log4j-dev.xml"))
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration name="Dev">
|
||||
<Loggers>
|
||||
<Logger name="de.cscherr.plextool" level="trace" additivity="false">
|
||||
<AppenderRef ref="DebugFile" level="${sys:fabric.log.debug.level:-debug}" />
|
||||
<AppenderRef ref="SysOut" />
|
||||
<AppenderRef ref="LatestFile" level="${sys:fabric.log.level:-info}" />
|
||||
<AppenderRef ref="ServerGuiConsole" />
|
||||
</Logger>
|
||||
</Loggers>
|
||||
</Configuration>
|
|
@ -3,13 +3,16 @@ package de.cscherr.plextool;
|
|||
import net.fabricmc.api.ModInitializer;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.slf4j.LoggerFactoryFriend;
|
||||
import org.slf4j.event.Level;
|
||||
import org.slf4j.spi.LoggingEventBuilder;
|
||||
|
||||
public class PlexTool implements ModInitializer {
|
||||
// This logger is used to write text to the console and the log file.
|
||||
// It is considered best practice to use your mod id as the logger's name.
|
||||
// That way, it's clear which mod wrote info, warnings, and errors.
|
||||
public static final String MOD_ID = "PlexTool";
|
||||
public static final String VERSION_NUMBER = "0.1.0";
|
||||
public static final String VERSION_NUMBER = "0.1.1";
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
|
||||
|
||||
@Override
|
||||
|
@ -18,6 +21,7 @@ public class PlexTool implements ModInitializer {
|
|||
// However, some things (like resources) may still be uninitialized.
|
||||
// Proceed with mild caution.
|
||||
|
||||
LOGGER.debug("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
|
||||
LOGGER.info("Initializing PlexTool");
|
||||
}
|
||||
}
|
|
@ -9,35 +9,48 @@ import net.minecraft.screen.ScreenTexts;
|
|||
import net.minecraft.text.Text;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import org.slf4j.event.Level;
|
||||
|
||||
public class PlexToolUiScreen extends Screen {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(PlexToolUiScreen.class.getSimpleName());
|
||||
private static final Logger LOGGER = PlexTool.LOGGER;
|
||||
private static final Text INFO_TEXT = Text.literal("Hello world");
|
||||
private final Screen parent;
|
||||
private ButtonWidget doneButton;
|
||||
private ButtonWidget dummyButton;
|
||||
|
||||
public PlexToolUiScreen(String name, Screen parent) {
|
||||
super(Text.literal(name));
|
||||
public PlexToolUiScreen(Text name, Screen parent) {
|
||||
super(name);
|
||||
LOGGER.trace("Constructing the UI, call to super is done");
|
||||
this.parent = parent;
|
||||
LOGGER.info("Constructed the UI");
|
||||
LOGGER.info("Constructed the UI Screen");
|
||||
}
|
||||
|
||||
public PlexToolUiScreen(Text name) {
|
||||
super(name);
|
||||
LOGGER.trace("Constructing the UI, call to super is done");
|
||||
this.parent = null;
|
||||
LOGGER.info("Constructed the UI Screen without a parent");
|
||||
}
|
||||
@Override
|
||||
protected void init() {
|
||||
//assert this.client != null;
|
||||
//Window window = this.client.getWindow();
|
||||
//Monitor monitor = window.getMonitor();
|
||||
LOGGER.trace(PlexToolUiScreen.class.getSimpleName() + " init started");
|
||||
|
||||
this.addDrawable(ButtonWidget.builder(INFO_TEXT, button -> {
|
||||
LOGGER.info("Pressed dummy button");
|
||||
}).dimensions(this.width / 2 - 100, this.height - 10, 200, 20).build());
|
||||
//this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, button -> {
|
||||
// this.client.options.write();
|
||||
// this.apply();
|
||||
// this.client.setScreen(this.parent);
|
||||
//}).dimensions(this.width / 2 - 100, this.height - 27, 200, 20).build());
|
||||
dummyButton = ButtonWidget.builder(Text.literal("Dummy"), b -> apply()).build();
|
||||
doneButton = ButtonWidget.builder(Text.literal("Done"), b -> apply()).build();
|
||||
|
||||
this.addDrawableChild(doneButton);
|
||||
|
||||
LOGGER.info(PlexToolUiScreen.class.getSimpleName() + " init finished");
|
||||
}
|
||||
|
||||
private void apply() {
|
||||
LOGGER.trace("applying PlexToolUI Options, not implemented");
|
||||
|
||||
// return to the parent screen, should be OptionsScreen
|
||||
assert client != null;
|
||||
client.setScreen(parent);
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package de.cscherr.plextool.mixin;
|
||||
|
||||
import de.cscherr.plextool.PlexTool;
|
||||
import net.minecraft.network.ClientConnection;
|
||||
import net.minecraft.network.PacketCallbacks;
|
||||
import net.minecraft.network.listener.PacketListener;
|
||||
|
@ -42,7 +43,7 @@ public class PlexToolMixin {
|
|||
@Mixin(ClientConnection.class)
|
||||
public class PlexToolPackets {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger("PlexToolMixin");
|
||||
private static final Logger LOGGER = PlexTool.LOGGER;
|
||||
private static boolean logSent = true;
|
||||
private static boolean logReceived = false;
|
||||
|
||||
|
|
|
@ -1,23 +1,22 @@
|
|||
package de.cscherr.plextool.mixin;
|
||||
|
||||
import de.cscherr.plextool.PlexTool;
|
||||
import de.cscherr.plextool.PlexToolUiScreen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.option.OptionsScreen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.client.util.Monitor;
|
||||
import net.minecraft.client.util.Window;
|
||||
import net.minecraft.text.Text;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
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;
|
||||
|
||||
|
||||
@Mixin(OptionsScreen.class)
|
||||
public abstract class PlexToolUIMixin extends Screen {
|
||||
private static final Text PLEXTOOL_TEXT = Text.literal("PlexTool");
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(PlexToolUIMixin.class.getSimpleName());
|
||||
private static final Logger LOGGER = PlexTool.LOGGER;
|
||||
|
||||
protected PlexToolUIMixin(Text title) {
|
||||
super(title);
|
||||
|
@ -25,9 +24,14 @@ public abstract class PlexToolUIMixin extends Screen {
|
|||
|
||||
@Inject(method = "init", at = @At("RETURN"))
|
||||
private void init(CallbackInfo callback) {
|
||||
addDrawable(ButtonWidget.builder(Text.literal("PT"), button -> {
|
||||
ButtonWidget plexToolButton = ButtonWidget.builder(PLEXTOOL_TEXT, button -> {
|
||||
LOGGER.info("Opening PlexToolUiScreen");
|
||||
assert client != null;
|
||||
client.setScreen(new PlexToolUiScreen(PLEXTOOL_TEXT.getString(), (OptionsScreen)(Object)this));
|
||||
}).position(this.width / 2 - 180, this.height / 6 + 120 - 6).size(20, 20).build());
|
||||
PlexToolUiScreen plexToolUiScreen = new PlexToolUiScreen(PLEXTOOL_TEXT, (OptionsScreen)(Object)this);
|
||||
client.setScreen(plexToolUiScreen);
|
||||
}).build();
|
||||
this.addDrawable(plexToolButton);
|
||||
|
||||
LOGGER.info(PlexToolUIMixin.class.getSimpleName() + " init finished");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,19 +1,28 @@
|
|||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "plextool",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.1",
|
||||
|
||||
"name": "PlexSheeps tool mod",
|
||||
"description": "Some of these might be considered hacking tools.",
|
||||
"name": "PlexSheep Utilities mod",
|
||||
"description": "This mod contains some technical tools used by PlexSheep while playing Minecraft. Some of these might be considered hacking tools.",
|
||||
"authors": [
|
||||
"Plexsheep <software@cscherr.de>"
|
||||
{
|
||||
"name": "Christoph J. Scherr",
|
||||
"contact": {
|
||||
"email": "software@cscherr.de",
|
||||
"homepage": "https://www.cscherr.de",
|
||||
"issues": "https://github.com/PlexSheep/PlexTool/issues",
|
||||
"sources": "https://hithub.com/PlexSheep/PlexTool"
|
||||
}
|
||||
}
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://www.cscherr.de/",
|
||||
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
||||
"email": "software@cscherr.de",
|
||||
"homepage": "https://www.cscherr.de",
|
||||
"issues": "https://github.com/PlexSheep/PlexTool/issues",
|
||||
"sources": "https://hithub.com/PlexSheep/PlexTool"
|
||||
},
|
||||
|
||||
"license": "CC0-1.0",
|
||||
"license": "MIT",
|
||||
"icon": "assets/modid/icon.png",
|
||||
|
||||
"environment": "*",
|
||||
|
|
Reference in New Issue