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 20w13a

Browse Source
This commit is contained in:
Alexander01998 2020-03-25 20:35:10 +01:00
parent 7cd326882e
commit 16c6e26969
6 changed files with 14 additions and 14 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=20w12a
yarn_mappings=20w12a+build.5
loader_version=0.7.8+build.188
minecraft_version=20w13a
yarn_mappings=20w13a+build.1
loader_version=0.7.8+build.189
#Fabric api
fabric_version=0.5.5+build.311-1.16
fabric_version=0.5.6+build.313-1.16
# Mod Properties
mod_version = v7.1.2-MC20w12a
mod_version = v7.1.2-MC20w13a
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 = "20w12a";
public static final String MC_VERSION = "20w13a";
private WurstAnalytics analytics;
private EventManager eventManager;

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

@ -12,8 +12,8 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.entity.FishingBobberEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.projectile.FishingBobberEntity;
import net.minecraft.item.FishingRodItem;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;

6
src/main/java/net/wurstclient/mixin/AbstractBlockStateMixin.java
View File

@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableMap;
import net.minecraft.block.AbstractBlock.AbstractBlockState;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityContext;
import net.minecraft.block.ShapeContext;
import net.minecraft.state.AbstractState;
import net.minecraft.state.State;
import net.minecraft.state.property.Property;
@ -78,9 +78,9 @@ public class AbstractBlockStateMixin extends AbstractState<Block, BlockState>
"getOutlineShape(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityContext;)Lnet/minecraft/util/shape/VoxelShape;"},
cancellable = true)
private void onGetOutlineShape(BlockView view, BlockPos pos,
EntityContext context, CallbackInfoReturnable<VoxelShape> cir)
ShapeContext context, CallbackInfoReturnable<VoxelShape> cir)
{
if(context == EntityContext.absent())
if(context == ShapeContext.absent())
return;
HackList hax = WurstClient.INSTANCE.getHax();

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

@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.CactusBlock;
import net.minecraft.entity.EntityContext;
import net.minecraft.block.ShapeContext;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
@ -37,7 +37,7 @@ public abstract class CactusBlockMixin extends Block
cancellable = true)
private void onGetCollisionShape(BlockState blockState_1,
BlockView blockView_1, BlockPos blockPos_1,
EntityContext entityContext_1, CallbackInfoReturnable<VoxelShape> cir)
ShapeContext entityContext_1, CallbackInfoReturnable<VoxelShape> cir)
{
EventManager events = WurstClient.INSTANCE.getEventManager();
if(events == null)

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

@ -13,7 +13,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.FluidBlock;
import net.minecraft.block.FluidDrainable;
import net.minecraft.entity.EntityContext;
import net.minecraft.block.ShapeContext;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
@ -32,7 +32,7 @@ public abstract class FluidBlockMixin extends Block implements FluidDrainable
@Override
public VoxelShape getCollisionShape(BlockState blockState_1,
BlockView blockView_1, BlockPos blockPos_1,
EntityContext entityContext_1)
ShapeContext entityContext_1)
{
HackList hax = WurstClient.INSTANCE.getHax();
if(hax != null && hax.jesusHack.shouldBeSolid())