1.18 official

NucleoidMC · Dec 2, 2021 · 4316cd6 · 4316cd6
1 parent 9bea9bc
commit 4316cd6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 }
 
 architectury {
-    common(false)
+    common()
 }
 
 configurations {

diff --git a/common/src/main/java/xyz/nucleoid/disguiselib/packets/FakePackets.java b/common/src/main/java/xyz/nucleoid/disguiselib/packets/FakePackets.java
@@ -117,8 +117,8 @@ public static PlayerSpawnS2CPacket fakePlayerSpawnS2CPacket(Entity entity) {
         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);
+        if (disguise instanceof PlayerEntity playerDisguise)  // Needed in case of taterzens - when they're disguised "back" to players, the check will be false
+            packet = new PlayerSpawnS2CPacket(playerDisguise);
         else
             packet = new PlayerSpawnS2CPacket(entity.getServer().getPlayerManager().getPlayerList().get(0));
 

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -34,12 +34,6 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
 
-    //modRuntime 'com.github.CaffeineMC:Lithium-fabric:1.17.x~stable-SNAPSHOT'
-    //modRuntime "com.github.astei:lazydfu:0.1.2"
-
-    // Testing with /disguise command
-    //modRuntime 'com.github.samolego:MobDisguises:d6cc302588'
-
     common(project(path: ":common", configuration: "dev")) {
         transitive = false
     }

diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.18-rc1
-yarn_mappings=1.18-rc1+build.1
-loader_version=0.12.5
+minecraft_version=1.18
+yarn_mappings=1.18+build.1
+loader_version=0.12.8
 
 #Fabric api
 fabric_version=0.43.1+1.18
 
 #Forge
-forge_version=37.0.69
+forge_version=38.0.10
 
 # Mod Properties
-mod_version = 1.1.1
+mod_version = 1.1.2
 maven_group = xyz.nucleoid
 archives_base_name = disguiselib
diff --git a/settings.gradle b/settings.gradle
@@ -9,4 +9,4 @@ pluginManagement {
 
 include("common")
 include("fabric")
-//include("forge")
+include("forge")