1.18-rc1

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         # Use these Java versions
-        java: [16]
+        java: [17]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]
     runs-on: ${{ matrix.os }}

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

common/build.gradle

@@ -5,7 +5,7 @@ dependencies {
 }
 
 architectury {
-    common()
+    common(false)
 }
 
 configurations {

common/src/main/java/xyz/nucleoid/disguiselib/mixin/EntityMixin_Disguise.java

@@ -368,7 +368,7 @@ public void setGameProfile(@Nullable GameProfile gameProfile) {
 
         // Changing entity on client
         if(this.disguiselib$entity instanceof ServerPlayerEntity player) {
-            ServerWorld targetWorld = player.getServerWorld();
+            ServerWorld targetWorld = player.getWorld();
 
             player.networkHandler.sendPacket(new PlayerRespawnS2CPacket(
                     targetWorld.getDimension(),

common/src/main/java/xyz/nucleoid/disguiselib/mixin/ServerPlayNetworkHandlerMixin_Disguiser.java

@@ -247,6 +247,8 @@ private void disguiseEntity(Packet<?> packet, GenericFutureListener<? extends Fu
     @Inject(method = "onPlayerMove(Lnet/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket;)V", at = @At("RETURN"))
     private void removeFromTablist(PlayerMoveC2SPacket packet, CallbackInfo ci) {
         if(!this.disguiselib$q.isEmpty() && --this.disguiselib$qTimer <= 0) {
+            // fixme - non-living disguised as player still not showing up
+            // fixme - player sometimes gets removed from tablist :(
             this.disguiselib$skipCheck = true;
             this.disguiselib$q.forEach(this::sendPacket);
             this.disguiselib$q.clear();

common/src/main/java/xyz/nucleoid/disguiselib/packets/FakePackets.java

@@ -114,7 +114,14 @@ public static EntitySpawnS2CPacket fakeEntitySpawnS2CPacket(Entity entity) {
      * @return fake {@link PlayerSpawnS2CPacket}
      */
     public static PlayerSpawnS2CPacket fakePlayerSpawnS2CPacket(Entity entity) {
-        PlayerSpawnS2CPacket packet = new PlayerSpawnS2CPacket((PlayerEntity) ((EntityDisguise) entity).getDisguiseEntity());
+        Entity disguise = ((EntityDisguise) entity).getDisguiseEntity();
+        PlayerSpawnS2CPacket packet;
+
+        if (disguise instanceof PlayerEntity)  // Needed in case of taterzens - when they're disguised "back" to players, the check will be false
+            packet = new PlayerSpawnS2CPacket((PlayerEntity) disguise);
+        else
+            packet = new PlayerSpawnS2CPacket(entity.getServer().getPlayerManager().getPlayerList().get(0));
+
         PlayerSpawnS2CPacketAccessor accessor = (PlayerSpawnS2CPacketAccessor) packet;
 
         accessor.setId(entity.getId());

gradle.properties

@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.61
-loader_version=0.11.7
+minecraft_version=1.18-rc1
+yarn_mappings=1.18-rc1+build.1
+loader_version=0.12.5
 
 #Fabric api
-fabric_version=0.40.1+1.17
+fabric_version=0.43.1+1.18
 
 #Forge
 forge_version=37.0.69
 
 # Mod Properties
-mod_version = 1.1.0
+mod_version = 1.1.1
 maven_group = xyz.nucleoid
 archives_base_name = disguiselib

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.3-20210922232132+0000-bin.zip
+distributionUrl=https://services.gradle.org/distributions-snapshots/gradle-7.4-20211124232407+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,3 +1,3 @@
 before_install:
   - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - source install-jdk.sh --feature 16
+  - source install-jdk.sh --feature 17

settings.gradle

@@ -9,4 +9,4 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+//include("forge")