diff --git a/src/main/java/me/samipourquoi/Epiphany.java b/src/main/java/me/samipourquoi/Epiphany.java index 8454dc8..ba89bb9 100644 --- a/src/main/java/me/samipourquoi/Epiphany.java +++ b/src/main/java/me/samipourquoi/Epiphany.java @@ -1,9 +1,5 @@ package me.samipourquoi; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ingame.BookEditScreen; -import net.minecraft.client.gui.screen.ingame.BookScreen; import net.minecraft.util.Identifier; public class Epiphany { diff --git a/src/main/java/me/samipourquoi/Settings.java b/src/main/java/me/samipourquoi/Settings.java index 5bec1f6..e77536e 100644 --- a/src/main/java/me/samipourquoi/Settings.java +++ b/src/main/java/me/samipourquoi/Settings.java @@ -24,9 +24,9 @@ public static void writeOptions(PrintWriter printWriter) { public static class OPTIONS { public static BooleanOption SMALL_BOOK = new BooleanOption( - "options.small_book", - gameOptions -> Settings.SMALL_BOOK, - (gameOptions, enableSmallBook) -> Settings.SMALL_BOOK = enableSmallBook); + "options.small_book", + gameOptions -> Settings.SMALL_BOOK, + (gameOptions, enableSmallBook) -> Settings.SMALL_BOOK = enableSmallBook); public static BooleanOption BOOKMARKING = new BooleanOption( "options.bookmarking", diff --git a/src/main/java/me/samipourquoi/gui/BookScreenRescaler.java b/src/main/java/me/samipourquoi/gui/BookScreenRescaler.java index a389c0a..98d50f6 100644 --- a/src/main/java/me/samipourquoi/gui/BookScreenRescaler.java +++ b/src/main/java/me/samipourquoi/gui/BookScreenRescaler.java @@ -6,8 +6,6 @@ import net.minecraft.client.gui.screen.ingame.BookEditScreen; import net.minecraft.client.gui.screen.ingame.BookScreen; import net.minecraft.client.util.math.MatrixStack; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; public class BookScreenRescaler { public static final float SCALING_FACTOR = 0.5f; @@ -40,7 +38,7 @@ public static void updateTranslateValues(int width, int height) { public static int mapMouseX(int mouseX) { return isInSmallBookMode() ? - (int)(mouseX / SCALING_FACTOR) - TRANSLATE_X : + (int) (mouseX / SCALING_FACTOR) - TRANSLATE_X : mouseX; } diff --git a/src/main/java/me/samipourquoi/gui/EpiphanyOptionsMenu.java b/src/main/java/me/samipourquoi/gui/EpiphanyOptionsMenu.java index 100445d..c5a4cb0 100644 --- a/src/main/java/me/samipourquoi/gui/EpiphanyOptionsMenu.java +++ b/src/main/java/me/samipourquoi/gui/EpiphanyOptionsMenu.java @@ -20,8 +20,8 @@ public EpiphanyOptionsMenu() { @Override protected void init() { this.list = new ButtonListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); - this.list.addAll(new Option[]{ Settings.OPTIONS.SMALL_BOOK, - Settings.OPTIONS.BOOKMARKING }); + this.list.addAll(new Option[]{Settings.OPTIONS.SMALL_BOOK, + Settings.OPTIONS.BOOKMARKING}); this.children.add(this.list); this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 27, 200, 20, ScreenTexts.DONE, button -> { diff --git a/src/main/java/me/samipourquoi/gui/EpiphanyOptionsWidget.java b/src/main/java/me/samipourquoi/gui/EpiphanyOptionsWidget.java index 839984e..cbc06c9 100644 --- a/src/main/java/me/samipourquoi/gui/EpiphanyOptionsWidget.java +++ b/src/main/java/me/samipourquoi/gui/EpiphanyOptionsWidget.java @@ -1,6 +1,5 @@ package me.samipourquoi.gui; -import com.mojang.blaze3d.systems.RenderSystem; import me.samipourquoi.Epiphany; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -17,8 +16,8 @@ public EpiphanyOptionsWidget(int x, int y, ButtonWidget.PressAction action) { @Override public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { MinecraftClient.getInstance().getTextureManager().bindTexture(Epiphany.EPI_WIDGETS); - EpiphanyOptionsWidget.IconLocation iconLocation = this.isHovered()? - IconLocation.OPTIONS_HOVERED: + EpiphanyOptionsWidget.IconLocation iconLocation = this.isHovered() ? + IconLocation.OPTIONS_HOVERED : IconLocation.OPTIONS; this.drawTexture(matrices, this.x, this.y, iconLocation.u, iconLocation.v, this.width, this.height); } diff --git a/src/main/java/me/samipourquoi/mixin/MixinBookEditScreen.java b/src/main/java/me/samipourquoi/mixin/MixinBookEditScreen.java index 729d3b5..c0a76eb 100644 --- a/src/main/java/me/samipourquoi/mixin/MixinBookEditScreen.java +++ b/src/main/java/me/samipourquoi/mixin/MixinBookEditScreen.java @@ -18,10 +18,13 @@ @Mixin(BookEditScreen.class) public class MixinBookEditScreen extends Screen { - @Shadow private int currentPage; CompoundTag tag; + @Shadow + private int currentPage; - protected MixinBookEditScreen(Text title) { super(title); } + protected MixinBookEditScreen(Text title) { + super(title); + } @Inject(method = "", at = @At("RETURN")) @@ -36,10 +39,14 @@ private void createCustomTags(PlayerEntity playerEntity, ItemStack itemStack, Ha } @Inject(method = "openNextPage", at = @At("TAIL")) - private void openNextPageInject(CallbackInfo info) { this.updateCurrentPageNBT(); } + private void openNextPageInject(CallbackInfo info) { + this.updateCurrentPageNBT(); + } @Inject(method = "openPreviousPage", at = @At("TAIL")) - private void openPreviousPageInject(CallbackInfo info) { this.updateCurrentPageNBT(); } + private void openPreviousPageInject(CallbackInfo info) { + this.updateCurrentPageNBT(); + } private void updateCurrentPageNBT() { if (Settings.BOOKMARKING) { diff --git a/src/main/java/me/samipourquoi/mixin/MixinButtonWidget.java b/src/main/java/me/samipourquoi/mixin/MixinButtonWidget.java index ae01b81..1fd2353 100644 --- a/src/main/java/me/samipourquoi/mixin/MixinButtonWidget.java +++ b/src/main/java/me/samipourquoi/mixin/MixinButtonWidget.java @@ -1,16 +1,13 @@ package me.samipourquoi.mixin; -import me.samipourquoi.Settings; import me.samipourquoi.gui.BookScreenRescaler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.ingame.BookScreen; import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; @Mixin(ButtonWidget.class) -public class MixinButtonWidget extends AbstractButtonWidget{ +public class MixinButtonWidget extends AbstractButtonWidget { public MixinButtonWidget(int x, int y, int width, int height, Text message) { super(x, y, width, height, message); } @@ -18,8 +15,8 @@ public MixinButtonWidget(int x, int y, int width, int height, Text message) { @Override protected boolean clicked(double mouseX, double mouseY) { return super.clicked( - BookScreenRescaler.mapMouseX((int)mouseX), - BookScreenRescaler.mapMouseY((int)mouseY) + BookScreenRescaler.mapMouseX((int) mouseX), + BookScreenRescaler.mapMouseY((int) mouseY) ); } } diff --git a/src/main/java/me/samipourquoi/mixin/MixinGameRender.java b/src/main/java/me/samipourquoi/mixin/MixinGameRender.java index 887f941..33245af 100644 --- a/src/main/java/me/samipourquoi/mixin/MixinGameRender.java +++ b/src/main/java/me/samipourquoi/mixin/MixinGameRender.java @@ -1,20 +1,10 @@ package me.samipourquoi.mixin; -import me.samipourquoi.Epiphany; -import me.samipourquoi.Settings; import me.samipourquoi.gui.BookScreenRescaler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.ingame.BookScreen; import net.minecraft.client.render.GameRenderer; 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.ModifyVariable; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import java.util.Locale; -import java.util.Set; @Mixin(GameRenderer.class) public class MixinGameRender { @@ -26,7 +16,9 @@ public class MixinGameRender { ), index = 5 ) - private int mapMouseX(int mouseX) { return BookScreenRescaler.mapMouseX(mouseX); } + private int mapMouseX(int mouseX) { + return BookScreenRescaler.mapMouseX(mouseX); + } @ModifyVariable( method = "render", @@ -36,5 +28,7 @@ public class MixinGameRender { ), index = 6 ) - private int mapMouseY(int mouseY) { return BookScreenRescaler.mapMouseY(mouseY); } + private int mapMouseY(int mouseY) { + return BookScreenRescaler.mapMouseY(mouseY); + } } diff --git a/src/main/java/me/samipourquoi/mixin/MixinTitleScreen.java b/src/main/java/me/samipourquoi/mixin/MixinTitleScreen.java index 20c3a89..39f3661 100644 --- a/src/main/java/me/samipourquoi/mixin/MixinTitleScreen.java +++ b/src/main/java/me/samipourquoi/mixin/MixinTitleScreen.java @@ -4,9 +4,7 @@ import me.samipourquoi.gui.EpiphanyOptionsWidget; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.gui.screen.options.AccessibilityOptionsScreen; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject;