Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
c0508383 committed 2022-07-20 13:33:32 -05:00
commit 8cda6fbea8
620 files changed
+3 -9

No files matched your search

+1 -1
View File
@@ -34,7 +34,7 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.UUID;
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6-beta2")
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6-beta3")
public class CustomNpcs {
@ConfigProp(info = "Disable Chat Bubbles")
@@ -19,17 +19,11 @@ public class VersionCompatibility {
public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound compound){
if(npc.npcVersion == ModRev)
return;
if(npc.npcVersion < 19){
// Fix 64-Textures
String texture = compound.getString("Texture");
texture = texture.replace("64-Textures/", "");
compound.setString("Texture", texture);
if(npc.npcVersion < 19) {
if (compound.hasKey("CanDrown")) {
compound.setInteger("DrowningType", (compound.getBoolean("CanDrown") ? 1 : 0));
compound.removeTag("CanDrown");
}
}
if(npc.npcVersion < 18){
// Fix CloakTexture (Reorganization)