update cotton, fix some sync issues with the thief

Author: LemmaEOF

build.gradle

@@ -34,15 +34,15 @@ if(rootProject.file("private.gradle").exists()) { //Publishing details
 
 archivesBaseName = "skillcheck"
 group = "io.github.cottonmc"
-version = "1.0.9+1.14.2"
+version = "1.1.0+1.14.2"
 
 minecraft {
 	refmapName = "mixins.skillcheck.refmap.json"
 }
 
 repositories {
 	maven {
-		url "http://server.bbkr.space:8081/artifactory/libs-snapshot"
+		url "http://server.bbkr.space:8081/artifactory/libs-release"
 	}
 	maven { 
 		url "https://minecraft.curseforge.com/api/maven"
@@ -53,24 +53,18 @@ dependencies {
 	minecraft "com.mojang:minecraft:1.14.2"
 	mappings "net.fabricmc:yarn:1.14.2+build.2"
 	modCompile "net.fabricmc:fabric-loader:0.4.8+build.154"
-	modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0+build.170"
+	modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0+build.185"
 
-	modCompile "io.github.prospector.modmenu:ModMenu:1.5.3-84"
-	modCompile "io.github.cottonmc:cotton:0.6.7+1.14.1-SNAPSHOT"
-	include "io.github.cottonmc:cotton:0.6.7+1.14.1-SNAPSHOT"
+	modCompile "io.github.prospector.modmenu:ModMenu:1.6.2-92"
+	modCompile "io.github.cottonmc:cotton:0.8.2+1.14.2"
+	include "io.github.cottonmc:cotton:0.8.2+1.14.2"
 	modCompile "crochet:Crochet:1.0.4"
 	include "crochet:Crochet:1.0.4"
 	modCompile "cloth-config:ClothConfig:0.2.1.14"
 	include "cloth-config:ClothConfig:0.2.1.14"
 
-	include "net.fabricmc.fabric-api:fabric-api-base:0.1.0+"
-	include "net.fabricmc.fabric-api:fabric-commands-v0:0.1.1+"
-	include "net.fabricmc.fabric-api:fabric-containers-v0:0.1.2+"
-	include "net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.0+"
-	include "net.fabricmc.fabric-api:fabric-item-groups-v0:0.1.0+"
-	include "net.fabricmc.fabric-api:fabric-networking-v0:0.1.1+"
-	include "net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.1+"
-	include "net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.1.0+"
+	implementation "blue.endless:jankson:1.1.2"
+	compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false }
 }
 
 processResources {

src/main/java/io/github/cottonmc/skillcheck/api/traits/ClassManager.java

@@ -1,12 +1,12 @@
 package io.github.cottonmc.skillcheck.api.traits;
 
 import com.raphydaphy.crochet.data.PlayerData;
-import io.github.cottonmc.repackage.blue.endless.jankson.annotation.Nullable;
 import io.github.cottonmc.skillcheck.SkillCheck;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Identifier;
 
+import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

src/main/java/io/github/cottonmc/skillcheck/mixins/MixinThiefClient.java

@@ -3,6 +3,7 @@
 import com.mojang.authlib.GameProfile;
 import io.github.cottonmc.skillcheck.SkillCheck;
 import io.github.cottonmc.skillcheck.api.traits.ClassManager;
+import io.github.cottonmc.skillcheck.util.SkillCheckNetworking;
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
@@ -110,7 +111,7 @@ private void handleWallJump() {
 
 				this.setPosition(clingX, this.getPos().getY(), clingZ);
 				Vec3d previousVelocity = this.getVelocity();
-				this.fallDistance = 0.0F;
+				SkillCheckNetworking.clearFall();
 				double velY = previousVelocity.y;
 
 				if (previousVelocity.y < -0.5) {
@@ -260,6 +261,7 @@ private static void wallJump(PlayerEntity player, float up, float strafe, float
 		StatusEffectInstance jumpBoostEffect = player.getStatusEffect(StatusEffects.JUMP_BOOST);
 		if (jumpBoostEffect != null) jumpBoostLevel = jumpBoostEffect.getAmplifier() + 1;
 
+		SkillCheckNetworking.clearFall();
 		player.setVelocity(player.getVelocity().x + (strafe * f2 - forward * f1), up + (jumpBoostLevel * .075), player.getVelocity().z + (forward * f2 + strafe * f1));
 
 	}
@@ -302,7 +304,7 @@ private void handleDoubleJump() {
 				this.jump();
 				jumpCount++;
 
-				this.fallDistance = 0.0F;
+				SkillCheckNetworking.clearFall();
 
 			}
 

src/main/java/io/github/cottonmc/skillcheck/mixins/MixinThiefCommon.java

@@ -1,6 +1,5 @@
 package io.github.cottonmc.skillcheck.mixins;
 
-import io.github.cottonmc.repackage.blue.endless.jankson.annotation.Nullable;
 import io.github.cottonmc.skillcheck.SkillCheck;
 import io.github.cottonmc.skillcheck.util.ArrowEffects;
 import io.github.cottonmc.skillcheck.api.traits.ClassManager;
@@ -26,6 +25,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import javax.annotation.Nullable;
+
 @Mixin(PlayerEntity.class)
 public abstract class MixinThiefCommon extends LivingEntity {
 

src/main/java/io/github/cottonmc/skillcheck/util/SkillCheckConfig.java

@@ -1,7 +1,7 @@
 package io.github.cottonmc.skillcheck.util;
 
 import io.github.cottonmc.cotton.config.annotations.ConfigFile;
-import io.github.cottonmc.repackage.blue.endless.jankson.Comment;
+import blue.endless.jankson.Comment;
 
 @ConfigFile(name = "SkillCheck")
 public class SkillCheckConfig {

src/main/java/io/github/cottonmc/skillcheck/util/SkillCheckNetworking.java

@@ -5,13 +5,13 @@
 import io.github.cottonmc.skillcheck.container.CharacterSheetContainer;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
 import net.minecraft.container.Container;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.network.packet.CustomPayloadC2SPacket;
 import net.minecraft.util.Identifier;
@@ -23,6 +23,8 @@ public class SkillCheckNetworking {
 	public static final Identifier SYNC_LEVELUP = new Identifier(SkillCheck.MOD_ID, "sync_levelup");
 	public static final Identifier SYNC_PLAYER_LEVEL = new Identifier(SkillCheck.MOD_ID, "sync_player_level");
 
+	public static final Identifier CLEAR_FALL = new Identifier(SkillCheck.MOD_ID, "clear_fall");
+
 	public static void init() {
 		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient();
 		initServer();
@@ -53,6 +55,10 @@ public static void initServer() {
 				ClassManager.levelUp(packetContext.getPlayer(), id);
 			}
 		});
+		ServerSidePacketRegistry.INSTANCE.register(CLEAR_FALL, ((packetContext, packetByteBuf) -> {
+			PlayerEntity player = packetContext.getPlayer();
+			player.fallDistance = 0;
+		}));
 	}
 
 
@@ -74,4 +80,9 @@ public static void syncLevelup(Identifier id, int xpCost) {
 		buf.writeInt(xpCost);
 		MinecraftClient.getInstance().getNetworkHandler().getClientConnection().send(new CustomPayloadC2SPacket(SYNC_LEVELUP, buf));
 	}
+
+	public static void clearFall() {
+		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
+		MinecraftClient.getInstance().getNetworkHandler().getClientConnection().send(new CustomPayloadC2SPacket(CLEAR_FALL, buf));
+	}
 }