From 4810a0862792f509c885d91c3463451058953c91 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Wed, 11 Jan 2023 18:20:38 +0100 Subject: Update dependancies --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index dd7af5a8..e1ac9fda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,12 +10,12 @@ fabric_version=0.58.6+1.19.2 # Dependencies ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files) -clothconfig_version=7.0.65 +clothconfig_version=9.0.94 ## Mod Menu (https://www.curseforge.com/minecraft/mc-mods/modmenu/files) -mod_menu_version=4.0.6 +mod_menu_version=5.0.2 # Mod Properties -mod_version = 1.8.2 +mod_version = 1.8.3-beta maven_group = me.xmrvizzy archives_base_name = skyblocker modrinth_id=y6DuFGwJ -- cgit From c9c7bce2fa710b94db8bec7a2979d244ed41625c Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Wed, 11 Jan 2023 18:21:59 +0100 Subject: Update mappings --- gradle.properties | 8 ++++---- .../skyblocker/skyblock/dungeon/terminal/ColorTerminal.java | 2 +- .../me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java | 3 +-- .../me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java | 2 +- .../xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index e1ac9fda..0ad9fd32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US # Fabric Properties (https://fabricmc.net/versions.html) -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.1 -loader_version=0.14.8 +minecraft_version=1.19.3 +yarn_mappings=1.19.3+build.5 +loader_version=0.14.12 #Fabric api -fabric_version=0.58.6+1.19.2 +fabric_version=0.72.0+1.19.3 # Dependencies ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java index a589b759..9d0bbfe9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java @@ -6,9 +6,9 @@ import me.xmrvizzy.skyblocker.container.ContainerSolver; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.registry.Registry; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java index dc2d9947..ab378e1e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java @@ -1,9 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.itemlist; import net.minecraft.item.Items; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - import java.util.Map; public class ItemFixerUpper { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index a635cea2..1a3ebe2c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -48,7 +48,7 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select if (this.isOpen()) { matrices.push(); matrices.translate(0.0D, 0.0D, 100.0D); - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 57fcbcd2..6067ff48 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -36,7 +36,7 @@ public class ResultButtonWidget extends ClickableWidget { @Override public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { MinecraftClient client = MinecraftClient.getInstance(); - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE); this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java index 3c96e1f4..5ac11d57 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java @@ -41,7 +41,7 @@ public class RenderUtils { // Outline RenderSystem.disableCull(); - RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader); + RenderSystem.setShader(GameRenderer::getRenderTypeLinesProgram); RenderSystem.lineWidth(lineWidth); buffer.begin(VertexFormat.DrawMode.LINES, VertexFormats.LINES); diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java index 910c8a6c..ae490649 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java @@ -22,7 +22,7 @@ public class ToastBuilder implements Toast { @Override public Toast.Visibility draw(MatrixStack matrices, ToastManager manager, long startTime) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); -- cgit From 3b811d610ddf472befee398675dea5d12240795f Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sun, 15 Jan 2023 22:46:08 +0100 Subject: start fixing the rest i guess ? --- gradle.properties | 2 +- .../me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java | 8 +++++--- src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 0ad9fd32..f5a45f2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,4 @@ mod_version = 1.8.3-beta maven_group = me.xmrvizzy archives_base_name = skyblocker modrinth_id=y6DuFGwJ -suported_version=1.19.2 \ No newline at end of file +suported_version=1.19.3 \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java index 437e10f9..033272db 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java @@ -6,7 +6,7 @@ import me.xmrvizzy.skyblocker.utils.Utils; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.world.ClientWorld; -import net.minecraft.network.encryption.PlayerPublicKey; +// import net.minecraft.network.encryption.PlayerPublicKey; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -15,8 +15,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ClientPlayerEntity.class) public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity { - public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey publicKey) { - super(world, profile, publicKey); + // public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey publicKey) { + public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) { + // super(world, profile, publicKey); + super(world, profile); } @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true) diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java index 00f400ec..a4d1ee7b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java @@ -15,7 +15,8 @@ public class ItemUtils { public static List getTooltip(ItemStack item) { MinecraftClient client = MinecraftClient.getInstance(); if (client.player != null && item != null) - return item.getTooltip(client.player, TooltipContext.Default.NORMAL); + // return item.getTooltip(client.player, TooltipContext.Default.NORMAL); + return item.getTooltip(client.player, TooltipContext.Default.BASIC); return Collections.emptyList(); } -- cgit From 71f54129ed3c257f9bc7cf4f9817ccae22691be2 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Fri, 20 Jan 2023 21:47:23 +0100 Subject: Just commits change i forgot to commit some todos will follow --- gradle.properties | 7 +++++ .../skyblocker/skyblock/dungeon/Reparty.java | 6 +++-- .../skyblock/itemlist/ResultButtonWidget.java | 9 ++++--- .../skyblock/quicknav/QuickNavButton.java | 30 ++++++++++++++-------- .../me/xmrvizzy/skyblocker/utils/RenderUtils.java | 2 +- 5 files changed, 38 insertions(+), 16 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index f5a45f2f..f1ea4278 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,19 @@ org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US # Fabric Properties (https://fabricmc.net/versions.html) +## 1.19.3 minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 +## 1.19.2 +#minecraft_version=1.19.2 +#yarn_mappings=1.19.2+build.28 loader_version=0.14.12 #Fabric api +## 1.19.3 fabric_version=0.72.0+1.19.3 +## 1.19.2 +#fabric_version=0.72.0+1.19.2 # Dependencies ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java index c06822de..8bfa9c0a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java @@ -30,7 +30,8 @@ public class Reparty extends ChatPatternListener { dispatcher.register(ClientCommandManager.literal("rp").executes(context -> { if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0; this.repartying = true; - client.player.sendChatMessage("/p list", Text.of("/p list")); + //client.player.sendChatMessage("/p list", Text.of("/p list")); + client.player.sendMessage(Text.of("/p list")); return 0; })); }); @@ -77,6 +78,7 @@ public class Reparty extends ChatPatternListener { } private void sendCommand(ClientPlayerEntity player, String command, int delay) { - skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); + // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); + skyblocker.scheduler.schedule(() -> player.sendMessage(Text.of(command)), delay * BASE_DELAY); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 6067ff48..552d3def 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -38,9 +38,12 @@ public class ResultButtonWidget extends ClickableWidget { MinecraftClient client = MinecraftClient.getInstance(); RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE); - this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); - client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); - client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4); + // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); + this.drawTexture(matrices, this.getX(), this.getY(), 29, 206, this.getWidth(), this.getHeight()); + // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); + client.getItemRenderer().renderInGui(this.itemStack, this.getX() + 4, this.getY() + 4); + // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4); + client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4); } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index ac381240..985cbd22 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -49,8 +49,10 @@ public class QuickNavButton extends ClickableWidget { int w = ((HandledScreenAccessor)handledScreen).getBackgroundWidth(); int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight(); if (h > 166) --h; // why is this even a thing - this.x = x + this.index % 6 * 28 + 4; - this.y = this.index < 6 ? y - 28 : y + h - 4; + // this.x = x + this.index % 6 * 28 + 4; + this.setX(x + this.index % 6 * 28 + 4); + // this.y = this.index < 6 ? y - 28 : y + h - 4; + this.setY(this.index < 6 ? y - 28 : y + h - 4); this.u = 28; this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0); } @@ -60,7 +62,8 @@ public class QuickNavButton extends ClickableWidget { public void onClick(double mouseX, double mouseY) { if (!this.toggled) { this.toggled = true; - CLIENT.player.sendChatMessage(command, Text.of(command)); + // CLIENT.player.sendChatMessage(command, Text.of(command)); + CLIENT.player.sendMessage(Text.of(command)); } } @@ -72,21 +75,28 @@ public class QuickNavButton extends ClickableWidget { // render button background if (!this.toggled) { if (this.index >= 6) - this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4); + // this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4); + this.drawTexture(matrices, this.getX(), this.getY() + 4, this.u, this.v + 4, this.width, this.height - 4); else - this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4); - } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height); + // this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4); + this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height - 4); + // } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height); + } else this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height); // render button icon if (!this.toggled) { if (this.index >= 6) - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); else - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); } else { if (this.index >= 6) - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); else - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); } RenderSystem.enableDepthTest(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java index c659f4f9..0f2f3aef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -//import net.minecraft.util.math.Vec3f; +// import net.minecraft.util.math.Vec3f; import net.minecraft.util.math.RotationAxis; public class RenderUtils { -- cgit