update to 1.14.1, fix level-sync issue

CottonMC · May 14, 2019 · 885acea · 885acea
1 parent 0b271c3
commit 885acea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,18 +50,27 @@ repositories {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:1.14"
-	mappings "net.fabricmc:yarn:1.14+build.21"
-	modCompile "net.fabricmc:fabric-loader:0.4.4+build.138"
-	modCompile "net.fabricmc:fabric:0.2.7+build.127"
-
-	modCompile "io.github.prospector.modmenu:ModMenu:1.5.1-81"
-	modCompile "io.github.cottonmc:cotton:0.6.1+1.14-SNAPSHOT"
-	include "io.github.cottonmc:cotton:0.6.1+1.14-SNAPSHOT"
+	minecraft "com.mojang:minecraft:1.14.1"
+	mappings "net.fabricmc:yarn:1.14.1+build.4"
+	modCompile "net.fabricmc:fabric-loader:0.4.7+build.147"
+	modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0-pre+build.156"
+
+	modCompile "io.github.prospector.modmenu:ModMenu:1.5.3-84"
+	modCompile "io.github.cottonmc:cotton:0.6.6+1.14.1-SNAPSHOT"
+	include "io.github.cottonmc:cotton:0.6.6+1.14.1-SNAPSHOT"
 	modCompile "crochet:Crochet:1.0.2"
 	include "crochet:Crochet:1.0.2"
 	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+f1618918"
+	include "net.fabricmc.fabric-api:fabric-commands-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-containers-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-item-groups-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-networking-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.0+f1618918"
+	include "net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.1.0+f1618918"
 }
 
 processResources {

diff --git a/src/main/java/io/github/cottonmc/skillcheck/container/CharacterSheetScreen.java b/src/main/java/io/github/cottonmc/skillcheck/container/CharacterSheetScreen.java
@@ -41,8 +41,7 @@ private void syncClassIndex() {
 	}
 
 	private void syncLevelUp() {
-		if (!playerInventory.player.isCreative()) playerInventory.player.experienceLevel -= container.getLevelCost();
-		SkillCheckNetworking.syncLevelup(container.classes.get(index));
+		SkillCheckNetworking.syncLevelup(container.classes.get(index), container.getLevelCost());
 	}
 
 	@Override

diff --git a/src/main/java/io/github/cottonmc/skillcheck/util/SkillCheckNetworking.java b/src/main/java/io/github/cottonmc/skillcheck/util/SkillCheckNetworking.java
@@ -29,6 +29,8 @@ public static void init() {
 		}));
 		ServerSidePacketRegistry.INSTANCE.register(SYNC_LEVELUP, (((packetContext, packetByteBuf) -> {
 			Identifier id = packetByteBuf.readIdentifier();
+			int xpCost = packetByteBuf.readInt();
+			if (!packetContext.getPlayer().isCreative()) packetContext.getPlayer().experienceLevel -= xpCost;
 			ClassManager.levelUp(packetContext.getPlayer(), id);
 		})));
 	}
@@ -40,9 +42,10 @@ public static void syncSelection(int index) {
 		MinecraftClient.getInstance().getNetworkHandler().getClientConnection().send(new CustomPayloadC2SPacket(SYNC_SELECTION, buf));
 	}
 
-	public static void syncLevelup(Identifier id) {
+	public static void syncLevelup(Identifier id, int xpCost) {
 		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
 		buf.writeIdentifier(id);
+		buf.writeInt(xpCost);
 		MinecraftClient.getInstance().getNetworkHandler().getClientConnection().send(new CustomPayloadC2SPacket(SYNC_LEVELUP, buf));
 	}
 }