From 0732d98ff80146c50026be6f92970a1f4f4a437d Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Sat, 9 Apr 2022 01:31:21 -0400 Subject: [PATCH] 1.5.3 Gradle Update | Add Version Compatibility Changes Update Version to 1.5.3 Remove Useless String Statements / Comments Add Temporary Fixes to Version Compatibility as permanent fixes --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- src/main/java/noppes/npcs/ModelPartData.java | 3 --- src/main/java/noppes/npcs/VersionCompatibility.java | 12 +++++++++++- src/main/java/noppes/npcs/controllers/Dialog.java | 9 +-------- .../java/noppes/npcs/entity/EntityNPCInterface.java | 1 - 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 4f45aa49f..00d0fbc84 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.5.2" +version = "1.5.3" group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 39338ac97..be9a85cea 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -33,7 +33,7 @@ import java.io.File; import java.util.Set; import java.util.concurrent.Executors; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.5.2") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.5.3") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") diff --git a/src/main/java/noppes/npcs/ModelPartData.java b/src/main/java/noppes/npcs/ModelPartData.java index 98343d930..2cbe59974 100644 --- a/src/main/java/noppes/npcs/ModelPartData.java +++ b/src/main/java/noppes/npcs/ModelPartData.java @@ -35,9 +35,6 @@ public class ModelPartData { type = compound.getByte("Type"); color = compound.getInteger("Color"); texture = compound.getString("Texture"); - if(texture.contains("moreplayermodels:textures")){ - texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts"); - } playerTexture = compound.getBoolean("PlayerTexture"); location = null; } diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java index a1f935240..9891c6479 100644 --- a/src/main/java/noppes/npcs/VersionCompatibility.java +++ b/src/main/java/noppes/npcs/VersionCompatibility.java @@ -12,11 +12,21 @@ import noppes.npcs.controllers.Lines; import noppes.npcs.entity.EntityNPCInterface; public class VersionCompatibility { - public static int ModRev = 16; + public static int ModRev = 17; public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound compound){ if(npc.npcVersion == ModRev) return; + if(npc.npcVersion < 17){ + // Fix DialogDarkenScreen + if(compound.hasKey("DialogDarkenScreen")){ + compound.removeTag("DialogDarkenScreen"); + } + // Remove MPM Texture Requirement + String texture = compound.getString("Texture"); + texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts"); + compound.setString("Texture", texture); + } if(npc.npcVersion < 12){ CompatabilityFix(compound, npc.advanced.writeToNBT(new NBTTagCompound())); CompatabilityFix(compound, npc.ai.writeToNBT(new NBTTagCompound())); diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/Dialog.java index 05155e347..1a332473e 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/Dialog.java @@ -67,10 +67,7 @@ public class Dialog implements ICompatibilty, IDialog { else { darkenScreen = true; } - // Temporary Remove after Few Versions - if(compound.hasKey("DialogDarkenScreen")){ - compound.removeTag("DialogDarkenScreen"); - } + NBTTagList options = compound.getTagList("Options", 10); HashMap newoptions = new HashMap(); @@ -104,10 +101,6 @@ public class Dialog implements ICompatibilty, IDialog { compound.setBoolean("DialogDisableEsc", disableEsc); compound.setBoolean("DialogDarkScreen", darkenScreen); - // Temporary Remove after Few Versions - if(compound.hasKey("DialogDarkenScreen")){ - compound.removeTag("DialogDarkenScreen"); - } if(sound != null && !sound.isEmpty()) compound.setString("DialogSound", sound); diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 1bd0508e3..c8b672a82 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -140,7 +140,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public boolean updateClient = false; public boolean updateAI = false; -// Fly Change public FlyingMoveHelper flyMoveHelper = new FlyingMoveHelper(this); public PathNavigate flyNavigator = new PathNavigateFlying(this, worldObj);