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

Update to 20w11a

Browse Source
This commit is contained in:
Alexander01998 2020-03-11 19:35:42 +01:00
parent 990d688f3f
commit a8c09909c1
9 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle.properties
View File

@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html and
# https://www.curseforge.com/minecraft/mc-mods/fabric-api
minecraft_version=20w10a
yarn_mappings=20w10a+build.7
loader_version=0.7.8+build.186
minecraft_version=20w11a
yarn_mappings=20w11a+build.1
loader_version=0.7.8+build.187
#Fabric api
fabric_version=0.5.0+build.304-1.16
fabric_version=0.5.3+build.308-1.16
# Mod Properties
mod_version = v7.1.2-MC20w10a
mod_version = v7.1.2-MC20w11a
maven_group = net.wurstclient
archives_base_name = Wurst-Client

2
src/main/java/net/wurstclient/WurstClient.java
View File

@ -58,7 +58,7 @@ public enum WurstClient
public static final IMinecraftClient IMC = (IMinecraftClient)MC;
public static final String VERSION = "7.1.2";
public static final String MC_VERSION = "20w10a";
public static final String MC_VERSION = "20w11a";
private WurstAnalytics analytics;
private EventManager eventManager;

4
src/main/java/net/wurstclient/hacks/AutoArmorHack.java
View File

@ -11,8 +11,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
import net.minecraft.client.gui.screen.ingame.ScreenWithHandler;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@ -93,7 +93,7 @@ public final class AutoArmorHack extends Hack
}
// check screen
if(MC.currentScreen instanceof ContainerScreen
if(MC.currentScreen instanceof ScreenWithHandler
&& !(MC.currentScreen instanceof InventoryScreen))
return;

2
src/main/java/net/wurstclient/hacks/AutoToolHack.java
View File

@ -176,7 +176,7 @@ public final class AutoToolHack extends Hack
private float getMiningSpeed(ItemStack stack, BlockState state)
{
float speed = stack.getMiningSpeed(state);
float speed = stack.getMiningSpeedMultiplier(state);
if(speed > 1)
{

11
src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java
View File

@ -187,7 +187,7 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener
@Shadow
@Override
public void onCloseContainer(CloseContainerS2CPacket var1)
public void onCloseScreen(CloseScreenS2CPacket var1)
{
}
@ -201,21 +201,22 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener
@Shadow
@Override
public void onOpenHorseContainer(OpenHorseContainerS2CPacket var1)
public void onOpenHorseScreen(OpenHorseScreenS2CPacket var1)
{
}
@Shadow
@Override
public void onContainerPropertyUpdate(ContainerPropertyUpdateS2CPacket var1)
public void onScreenHandlerPropertyUpdate(
ScreenHandlerPropertyUpdateS2CPacket var1)
{
}
@Shadow
@Override
public void onContainerSlotUpdate(ContainerSlotUpdateS2CPacket var1)
public void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket var1)
{
}
@ -649,7 +650,7 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener
@Shadow
@Override
public void onOpenContainer(OpenContainerS2CPacket var1)
public void onOpenScreen(OpenScreenS2CPacket var1)
{
}

2
src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java
View File

@ -17,11 +17,11 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerInteractionManager;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.container.SlotActionType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;

23
src/main/java/net/wurstclient/mixin/ContainerScreen54Mixin.java
View File

@ -11,22 +11,22 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.client.gui.screen.ingame.ContainerProvider;
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
import net.minecraft.client.gui.screen.ingame.ScreenWithHandler;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.container.GenericContainer;
import net.minecraft.container.Slot;
import net.minecraft.container.SlotActionType;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.screen.GenericContainerScreenHandler;
import net.minecraft.screen.slot.Slot;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.text.Text;
import net.wurstclient.WurstClient;
import net.wurstclient.hacks.AutoStealHack;
@Mixin(GenericContainerScreen.class)
public abstract class ContainerScreen54Mixin
extends ContainerScreen<GenericContainer>
implements ContainerProvider<GenericContainer>
extends ScreenWithHandler<GenericContainerScreenHandler>
implements ScreenHandlerProvider<GenericContainerScreenHandler>
{
@Shadow
@Final
@ -36,7 +36,8 @@ public abstract class ContainerScreen54Mixin
WurstClient.INSTANCE.getHax().autoStealHack;
private int mode;
public ContainerScreen54Mixin(WurstClient wurst, GenericContainer container,
public ContainerScreen54Mixin(WurstClient wurst,
GenericContainerScreenHandler container,
PlayerInventory playerInventory, Text name)
{
super(container, playerInventory, name);
@ -52,10 +53,10 @@ public abstract class ContainerScreen54Mixin
if(autoSteal.areButtonsVisible())
{
addButton(new ButtonWidget(x + containerWidth - 108, y + 4, 50, 12,
addButton(new ButtonWidget(x + backgroundWidth - 108, y + 4, 50, 12,
"Steal", b -> steal()));
addButton(new ButtonWidget(x + containerWidth - 56, y + 4, 50, 12,
addButton(new ButtonWidget(x + backgroundWidth - 56, y + 4, 50, 12,
"Store", b -> store()));
}
@ -93,7 +94,7 @@ public abstract class ContainerScreen54Mixin
for(int i = from; i < to; i++)
{
Slot slot = container.slots.get(i);
Slot slot = handler.slots.get(i);
if(slot.getStack().isEmpty())
continue;

6
src/main/java/net/wurstclient/util/FakePlayerEntity.java
View File

@ -54,9 +54,9 @@ public class FakePlayerEntity extends OtherClientPlayerEntity
private void resetCapeMovement()
{
field_7500 = getX();
field_7521 = getY();
field_7499 = getZ();
capeX = getX();
capeY = getY();
capeZ = getZ();
}
private void spawn()

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

@ -29,7 +29,7 @@
"depends": {
"fabricloader": ">=0.4.0",
"fabric": "*",
"minecraft": ">=1.16-alpha.20.10.a"
"minecraft": ">=1.16-alpha.20.11.a"
},
"suggests": {
"flamingo": "*"