mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-19 17:02:13 +02:00
Code

Update to 24w38a

Browse Source
This commit is contained in:
Alexander01998 2024-09-18 21:36:46 +02:00
parent 7ef9ffa5fc
commit 3e839b4f17
14 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/wurstclient/hacks/BaseFinderHack.java
View File

@ -19,6 +19,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -217,7 +218,7 @@ public final class BaseFinderHack extends Hack
BuiltBuffer buffer = bufferBuilder.end();
vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffer = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffer.bind();
vertexBuffer.upload(buffer);
VertexBuffer.unbind();

3
src/main/java/net/wurstclient/hacks/CaveFinderHack.java
View File

@ -23,6 +23,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.Blocks;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -273,7 +274,7 @@ public final class CaveFinderHack extends Hack
BuiltBuffer buffer = bufferBuilder.end();
vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffer = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffer.bind();
vertexBuffer.upload(buffer);
VertexBuffer.unbind();

3
src/main/java/net/wurstclient/hacks/MobEspHack.java
View File

@ -19,6 +19,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferRenderer;
@ -99,7 +100,7 @@ public final class MobEspHack extends Hack implements UpdateListener,
EVENTS.add(CameraTransformViewBobbingListener.class, this);
EVENTS.add(RenderListener.class, this);
mobBox = new VertexBuffer(VertexBuffer.Usage.STATIC);
mobBox = new VertexBuffer(Usage.STATIC_WRITE);
Box bb = new Box(-0.5, 0, -0.5, 0.5, 1, 0.5);
RenderUtils.drawOutlinedBox(bb, mobBox);
}

3
src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
View File

@ -26,6 +26,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.BlockState;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -348,7 +349,7 @@ public final class MobSpawnEspHack extends Hack
BuiltBuffer buffer = bufferBuilder.endNullable();
if(buffer != null)
{
vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffer = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffer.bind();
vertexBuffer.upload(buffer);
VertexBuffer.unbind();

3
src/main/java/net/wurstclient/hacks/SearchHack.java
View File

@ -22,6 +22,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.Block;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -277,7 +278,7 @@ public final class SearchHack extends Hack
BuiltBuffer buffer = bufferBuilder.endNullable();
vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffer = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffer.bind();
vertexBuffer.upload(buffer);
VertexBuffer.unbind();

11
src/main/java/net/wurstclient/hacks/TunnellerHack.java
View File

@ -24,6 +24,7 @@ import net.minecraft.block.FallingBlock;
import net.minecraft.block.TorchBlock;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.option.GameOptions;
@ -269,7 +270,7 @@ public final class TunnellerHack extends Hack
if(vertexBuffers[0] != null)
vertexBuffers[0].close();
vertexBuffers[0] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[0] = new VertexBuffer(Usage.STATIC_WRITE);
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator
@ -416,7 +417,7 @@ public final class TunnellerHack extends Hack
BuiltBuffer buffer = bufferBuilder.endNullable();
if(buffer != null)
{
vertexBuffers[1] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[1] = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffers[1].bind();
vertexBuffers[1].upload(buffer);
VertexBuffer.unbind();
@ -517,7 +518,7 @@ public final class TunnellerHack extends Hack
for(BlockPos pos : blocks)
RenderUtils.drawOutlinedBox(box.offset(pos), bufferBuilder);
vertexBuffers[2] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[2] = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffers[2].bind();
vertexBuffers[2].upload(bufferBuilder.end());
VertexBuffer.unbind();
@ -665,7 +666,7 @@ public final class TunnellerHack extends Hack
BuiltBuffer buffer = bufferBuilder.end();
vertexBuffers[3] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[3] = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffers[3].bind();
vertexBuffers[3].upload(buffer);
VertexBuffer.unbind();
@ -752,7 +753,7 @@ public final class TunnellerHack extends Hack
Vec3d torchVec =
Vec3d.ofBottomCenter(nextTorch).subtract(region.toVec3d());
vertexBuffers[4] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[4] = new VertexBuffer(Usage.STATIC_WRITE);
RenderUtils.drawArrow(torchVec, torchVec.add(0, 0.5, 0),
vertexBuffers[4]);

7
src/main/java/net/wurstclient/hacks/autofarm/AutoFarmRenderer.java
View File

@ -19,6 +19,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -121,7 +122,7 @@ public final class AutoFarmRenderer
if(blocksToHarvest.isEmpty())
return;
greenBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
greenBuffer = new VertexBuffer(Usage.STATIC_WRITE);
BufferBuilder bufferBuilder = tessellator
.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);
@ -149,7 +150,7 @@ public final class AutoFarmRenderer
if(plants.isEmpty())
return;
cyanBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
cyanBuffer = new VertexBuffer(Usage.STATIC_WRITE);
BufferBuilder bufferBuilder = tessellator
.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);
@ -177,7 +178,7 @@ public final class AutoFarmRenderer
if(blocksToReplant.isEmpty())
return;
redBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
redBuffer = new VertexBuffer(Usage.STATIC_WRITE);
BufferBuilder bufferBuilder = tessellator
.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);

5
src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java
View File

@ -15,6 +15,7 @@ import org.joml.Matrix4f;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferRenderer;
@ -109,8 +110,8 @@ public final class ChestEspRenderer
public static void prepareBuffers()
{
closeBuffers();
solidBox = new VertexBuffer(VertexBuffer.Usage.STATIC);
outlinedBox = new VertexBuffer(VertexBuffer.Usage.STATIC);
solidBox = new VertexBuffer(Usage.STATIC_WRITE);
outlinedBox = new VertexBuffer(Usage.STATIC_WRITE);
Box box = new Box(BlockPos.ORIGIN);
RenderUtils.drawSolidBox(box, solidBox);

3
src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java
View File

@ -14,6 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BuiltBuffer;
import net.minecraft.client.util.math.MatrixStack;
@ -47,7 +48,7 @@ public final class NewChunksRenderer
return;
}
vertexBuffers[i] = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffers[i] = new VertexBuffer(Usage.STATIC_WRITE);
vertexBuffers[i].bind();
vertexBuffers[i].upload(buffer);
VertexBuffer.unbind();

5
src/main/java/net/wurstclient/hacks/portalesp/PortalEspRenderer.java
View File

@ -15,6 +15,7 @@ import org.joml.Matrix4f;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferRenderer;
@ -109,8 +110,8 @@ public final class PortalEspRenderer
public static void prepareBuffers()
{
closeBuffers();
solidBox = new VertexBuffer(VertexBuffer.Usage.STATIC);
outlinedBox = new VertexBuffer(VertexBuffer.Usage.STATIC);
solidBox = new VertexBuffer(Usage.STATIC_WRITE);
outlinedBox = new VertexBuffer(Usage.STATIC_WRITE);
Box box = new Box(BlockPos.ORIGIN);
RenderUtils.drawSolidBox(box, solidBox);

3
src/main/java/net/wurstclient/hacks/treebot/Tree.java
View File

@ -15,6 +15,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.Usage;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
@ -46,7 +47,7 @@ public class Tree implements AutoCloseable
if(vertexBuffer != null)
vertexBuffer.close();
vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
vertexBuffer = new VertexBuffer(Usage.STATIC_WRITE);
double boxMin = 1 / 16.0;
double boxMax = 15 / 16.0;

20
src/main/java/net/wurstclient/mixin/StatsScreenMixin.java
View File

@ -33,6 +33,9 @@ public abstract class StatsScreenMixin extends Screen
super(title);
}
/**
* Adds the hidden "Enable/Disable Wurst" button on the Statistics screen.
*/
@Inject(at = @At("TAIL"), method = "createButtons()V")
private void onCreateButtons(CallbackInfo ci)
{
@ -42,25 +45,18 @@ public abstract class StatsScreenMixin extends Screen
toggleWurstButton = ButtonWidget
.builder(Text.literal(""), this::toggleWurst).width(150).build();
updateWurstButtonText(toggleWurstButton);
addDrawableChild(toggleWurstButton);
}
@Inject(at = @At("TAIL"), method = "initTabNavigation()V")
private void onInitTabNavigation(CallbackInfo ci)
{
if(toggleWurstButton == null)
return;
ClickableWidget doneButton = wurst_getDoneButton();
ClickableWidget doneButton = getDoneButton();
doneButton.setX(width / 2 + 2);
doneButton.setWidth(150);
toggleWurstButton.setPosition(width / 2 - 152, doneButton.getY());
updateWurstButtonText(toggleWurstButton);
addDrawableChild(toggleWurstButton);
}
@Unique
private ClickableWidget wurst_getDoneButton()
private ClickableWidget getDoneButton()
{
for(ClickableWidget button : Screens.getButtons(this))
if(button.getMessage().getString()

4
src/main/java/net/wurstclient/mixin/TitleScreenMixin.java
View File

@ -38,8 +38,8 @@ public abstract class TitleScreenMixin extends Screen
* Adds the AltManager button to the title screen. This mixin must not
* run in demo mode, as the Realms button doesn't exist there.
*/
@Inject(at = @At("RETURN"), method = "initWidgetsNormal(II)I")
private void onInitWidgetsNormal(int y, int spacingY,
@Inject(at = @At("RETURN"), method = "addNormalWidgets(II)I")
private void onAddNormalWidgets(int y, int spacingY,
CallbackInfoReturnable<Integer> cir)
{
if(!WurstClient.INSTANCE.isEnabled())

4
src/main/resources/fabric.mod.json
View File

@ -26,8 +26,8 @@
"accessWidener": "wurst.accesswidener",
"depends": {
"fabricloader": ">=0.16.3",
"fabric-api": ">=0.104.1",
"minecraft": "~1.21.2-alpha.24.37.a",
"fabric-api": ">=0.104.2",
"minecraft": "~1.21.2-alpha.24.38.a",
"java": ">=21"
},
"suggests": {