From fe64f1fd8a797cdbd9626696eda2fcf7578f930c Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 9 Mar 2023 10:17:48 -0700 Subject: [PATCH 1/2] 1.19.4-rc1 --- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- settings.gradle | 4 ++-- src/main/java/baritone/process/FarmProcess.java | 3 ++- src/main/java/baritone/process/FollowProcess.java | 3 ++- src/main/java/baritone/utils/GuiClick.java | 4 ++-- src/main/java/baritone/utils/IRenderer.java | 5 +++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 62a815d0f..69fcb4115 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,6 +26,6 @@ "depends": { "fabricloader": ">=0.11.0", - "minecraft": "1.19.3" + "minecraft": "1.19.4-rc.1" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7b0d1f440..d99b8caf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,6 @@ mod_version=1.9.1 maven_group=baritone archives_base_name=baritone -minecraft_version=1.19.3 +minecraft_version=1.19.4-rc1 forge_version=1.19.3-44.0.1 fabric_version=0.14.11 diff --git a/settings.gradle b/settings.gradle index 7809c35c6..58b6e203d 100755 --- a/settings.gradle +++ b/settings.gradle @@ -43,8 +43,8 @@ rootProject.name = 'baritone' include("tweaker") if (System.getProperty("Baritone.enabled_platforms") == null) { - System.setProperty("Baritone.enabled_platforms", "fabric,forge") -// System.setProperty("Baritone.enabled_platforms", "fabric") +// System.setProperty("Baritone.enabled_platforms", "fabric,forge") + System.setProperty("Baritone.enabled_platforms", "fabric") } for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) { include(platform) diff --git a/src/main/java/baritone/process/FarmProcess.java b/src/main/java/baritone/process/FarmProcess.java index 13112ca68..512951753 100644 --- a/src/main/java/baritone/process/FarmProcess.java +++ b/src/main/java/baritone/process/FarmProcess.java @@ -24,6 +24,7 @@ import baritone.api.pathing.goals.GoalComposite; import baritone.api.process.IFarmProcess; import baritone.api.process.PathingCommand; import baritone.api.process.PathingCommandType; +import baritone.api.utils.BetterBlockPos; import baritone.api.utils.RayTraceUtils; import baritone.api.utils.Rotation; import baritone.api.utils.RotationUtils; @@ -306,7 +307,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro ItemEntity ei = (ItemEntity) entity; if (PICKUP_DROPPED.contains(ei.getItem().getItem())) { // +0.1 because of farmland's 0.9375 dummy height lol - goalz.add(new GoalBlock(new BlockPos(entity.position().x, entity.position().y + 0.1, entity.position().z))); + goalz.add(new GoalBlock(new BetterBlockPos(entity.position().x, entity.position().y + 0.1, entity.position().z))); } } } diff --git a/src/main/java/baritone/process/FollowProcess.java b/src/main/java/baritone/process/FollowProcess.java index 085b17ae5..b123216a6 100644 --- a/src/main/java/baritone/process/FollowProcess.java +++ b/src/main/java/baritone/process/FollowProcess.java @@ -25,6 +25,7 @@ import baritone.api.pathing.goals.GoalXZ; import baritone.api.process.IFollowProcess; import baritone.api.process.PathingCommand; import baritone.api.process.PathingCommandType; +import baritone.api.utils.BetterBlockPos; import baritone.utils.BaritoneProcessHelper; import java.util.List; import java.util.function.Predicate; @@ -59,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo pos = following.blockPosition(); } else { GoalXZ g = GoalXZ.fromDirection(following.position(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value); - pos = new BlockPos(g.getX(), following.position().y, g.getZ()); + pos = new BetterBlockPos(g.getX(), following.position().y, g.getZ()); } return new GoalNear(pos, Baritone.settings().followRadius.value); } diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index b3b2dc500..5c7832b71 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -27,6 +27,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -133,7 +134,7 @@ public class GuiClick extends Screen implements Helper { //TODO: check IRenderer.glColor(Color.RED, 0.4F); RenderSystem.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value); - RenderSystem.disableTexture(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); RenderSystem.depthMask(false); RenderSystem.disableDepthTest(); BetterBlockPos a = new BetterBlockPos(currentMouseOver); @@ -142,7 +143,6 @@ public class GuiClick extends Screen implements Helper { RenderSystem.enableDepthTest(); RenderSystem.depthMask(true); - RenderSystem.enableTexture(); RenderSystem.disableBlend(); } } diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index 380fbd9e0..cfd38a393 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -24,6 +24,8 @@ import baritone.utils.accessor.IEntityRenderManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; import java.awt.*; + +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.world.phys.AABB; import org.joml.Matrix4f; @@ -48,10 +50,10 @@ public interface IRenderer { static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) { RenderSystem.enableBlend(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); glColor(color, alpha); RenderSystem.lineWidth(lineWidth); - RenderSystem.disableTexture(); RenderSystem.depthMask(false); if (ignoreDepth) { @@ -69,7 +71,6 @@ public interface IRenderer { } RenderSystem.depthMask(true); - RenderSystem.enableTexture(); RenderSystem.disableBlend(); } From a1e797ab5325ebe47a2307049b4e83e0559f96f3 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Mon, 13 Mar 2023 15:47:54 -0700 Subject: [PATCH 2/2] rc3 --- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 69fcb4115..17afc6c08 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,6 +26,6 @@ "depends": { "fabricloader": ">=0.11.0", - "minecraft": "1.19.4-rc.1" + "minecraft": "1.19.4-rc.3" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d99b8caf0..7d7c5c7f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,6 @@ mod_version=1.9.1 maven_group=baritone archives_base_name=baritone -minecraft_version=1.19.4-rc1 +minecraft_version=1.19.4-rc3 forge_version=1.19.3-44.0.1 fabric_version=0.14.11