mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 18:54:53 +00:00
Proper Reformating
This commit is contained in:
1 parent
ce75880aba
commit
180d257024
1179 files changed
+59847
-61583
No files matched your search
@@ -13,207 +13,207 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public class VersionCompatibility {
|
||||
public static int ModRev = 22;
|
||||
public static int ModRev = 22;
|
||||
|
||||
public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound compound){
|
||||
if(npc.npcVersion == ModRev)
|
||||
return;
|
||||
if(npc.npcVersion < 22) {
|
||||
if (compound.hasKey("CanLeap")) {
|
||||
boolean canLeap = compound.getBoolean("CanLeap");
|
||||
compound.setInteger("LeapType", !canLeap ? 0 : 1);
|
||||
}
|
||||
}
|
||||
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)
|
||||
String cloakTexture = compound.getString("CloakTexture");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Daybreak/", "/cloak/Guilds/Daybreak/");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Created/", "/cloak/Extras/");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Color Capes/", "/cloak/Color/");
|
||||
compound.setString("CloakTexture", cloakTexture);
|
||||
}
|
||||
if(npc.npcVersion < 17){
|
||||
// Fix DialogDarkenScreen
|
||||
if(compound.hasKey("DialogDarkenScreen")){
|
||||
compound.removeTag("DialogDarkenScreen");
|
||||
}
|
||||
}
|
||||
if(npc.npcVersion < 12){
|
||||
CompatabilityFix(compound, npc.advanced.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.ais.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.stats.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.display.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
|
||||
}
|
||||
if(npc.npcVersion < 5){
|
||||
String texture = compound.getString("Texture");
|
||||
texture = texture.replace("/mob/customnpcs/", "customnpcs:textures/entity/");
|
||||
texture = texture.replace("/mob/", "customnpcs:textures/entity/");
|
||||
compound.setString("Texture", texture);
|
||||
}
|
||||
if(npc.npcVersion < 6 && compound.getTag("NpcInteractLines") instanceof NBTTagList){
|
||||
List<String> interactLines = NBTTags.getStringList(compound.getTagList("NpcInteractLines", 10));
|
||||
Lines lines = new Lines();
|
||||
for(int i = 0; i < interactLines.size(); i++){
|
||||
Line line = new Line();
|
||||
line.text = (String) interactLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcInteractLines", lines.writeToNBT());
|
||||
public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound compound) {
|
||||
if (npc.npcVersion == ModRev)
|
||||
return;
|
||||
if (npc.npcVersion < 22) {
|
||||
if (compound.hasKey("CanLeap")) {
|
||||
boolean canLeap = compound.getBoolean("CanLeap");
|
||||
compound.setInteger("LeapType", !canLeap ? 0 : 1);
|
||||
}
|
||||
}
|
||||
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)
|
||||
String cloakTexture = compound.getString("CloakTexture");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Daybreak/", "/cloak/Guilds/Daybreak/");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Created/", "/cloak/Extras/");
|
||||
cloakTexture = cloakTexture.replace("/cloak/Color Capes/", "/cloak/Color/");
|
||||
compound.setString("CloakTexture", cloakTexture);
|
||||
}
|
||||
if (npc.npcVersion < 17) {
|
||||
// Fix DialogDarkenScreen
|
||||
if (compound.hasKey("DialogDarkenScreen")) {
|
||||
compound.removeTag("DialogDarkenScreen");
|
||||
}
|
||||
}
|
||||
if (npc.npcVersion < 12) {
|
||||
CompatabilityFix(compound, npc.advanced.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.ais.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.stats.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.display.writeToNBT(new NBTTagCompound()));
|
||||
CompatabilityFix(compound, npc.inventory.writeEntityToNBT(new NBTTagCompound()));
|
||||
}
|
||||
if (npc.npcVersion < 5) {
|
||||
String texture = compound.getString("Texture");
|
||||
texture = texture.replace("/mob/customnpcs/", "customnpcs:textures/entity/");
|
||||
texture = texture.replace("/mob/", "customnpcs:textures/entity/");
|
||||
compound.setString("Texture", texture);
|
||||
}
|
||||
if (npc.npcVersion < 6 && compound.getTag("NpcInteractLines") instanceof NBTTagList) {
|
||||
List<String> interactLines = NBTTags.getStringList(compound.getTagList("NpcInteractLines", 10));
|
||||
Lines lines = new Lines();
|
||||
for (int i = 0; i < interactLines.size(); i++) {
|
||||
Line line = new Line();
|
||||
line.text = (String) interactLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcInteractLines", lines.writeToNBT());
|
||||
|
||||
List<String> worldLines = NBTTags.getStringList(compound.getTagList("NpcLines", 10));
|
||||
lines = new Lines();
|
||||
for(int i = 0; i < worldLines.size(); i++){
|
||||
Line line = new Line();
|
||||
line.text = (String) worldLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcLines", lines.writeToNBT());
|
||||
List<String> worldLines = NBTTags.getStringList(compound.getTagList("NpcLines", 10));
|
||||
lines = new Lines();
|
||||
for (int i = 0; i < worldLines.size(); i++) {
|
||||
Line line = new Line();
|
||||
line.text = (String) worldLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcLines", lines.writeToNBT());
|
||||
|
||||
List<String> attackLines = NBTTags.getStringList(compound.getTagList("NpcAttackLines", 10));
|
||||
lines = new Lines();
|
||||
for(int i = 0; i < attackLines.size(); i++){
|
||||
Line line = new Line();
|
||||
line.text = (String) attackLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcAttackLines", lines.writeToNBT());
|
||||
List<String> attackLines = NBTTags.getStringList(compound.getTagList("NpcAttackLines", 10));
|
||||
lines = new Lines();
|
||||
for (int i = 0; i < attackLines.size(); i++) {
|
||||
Line line = new Line();
|
||||
line.text = (String) attackLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcAttackLines", lines.writeToNBT());
|
||||
|
||||
List<String> killedLines = NBTTags.getStringList(compound.getTagList("NpcKilledLines", 10));
|
||||
lines = new Lines();
|
||||
for(int i = 0; i < killedLines.size(); i++){
|
||||
Line line = new Line();
|
||||
line.text = (String) killedLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcKilledLines", lines.writeToNBT());
|
||||
List<String> killedLines = NBTTags.getStringList(compound.getTagList("NpcKilledLines", 10));
|
||||
lines = new Lines();
|
||||
for (int i = 0; i < killedLines.size(); i++) {
|
||||
Line line = new Line();
|
||||
line.text = (String) killedLines.toArray()[i];
|
||||
lines.lines.put(i, line);
|
||||
}
|
||||
compound.setTag("NpcKilledLines", lines.writeToNBT());
|
||||
|
||||
}
|
||||
if(npc.npcVersion == 12){
|
||||
NBTTagList list = compound.getTagList("StartPos", 3);
|
||||
if(list.tagCount() == 3){
|
||||
int z = ((NBTTagInt) list.removeTag(2)).func_150287_d();
|
||||
int y = ((NBTTagInt) list.removeTag(1)).func_150287_d();
|
||||
int x = ((NBTTagInt) list.removeTag(0)).func_150287_d();
|
||||
}
|
||||
if (npc.npcVersion == 12) {
|
||||
NBTTagList list = compound.getTagList("StartPos", 3);
|
||||
if (list.tagCount() == 3) {
|
||||
int z = ((NBTTagInt) list.removeTag(2)).func_150287_d();
|
||||
int y = ((NBTTagInt) list.removeTag(1)).func_150287_d();
|
||||
int x = ((NBTTagInt) list.removeTag(0)).func_150287_d();
|
||||
|
||||
compound.setIntArray("StartPosNew", new int[]{x,y,z});
|
||||
}
|
||||
}
|
||||
if(npc.npcVersion == 13){
|
||||
boolean bo = compound.getBoolean("HealthRegen");
|
||||
compound.setInteger("HealthRegen", bo?1:0);
|
||||
NBTTagCompound comp = compound.getCompoundTag("TransformStats");
|
||||
bo = comp.getBoolean("HealthRegen");
|
||||
comp.setInteger("HealthRegen", bo?1:0);
|
||||
compound.setTag("TransformStats", comp);
|
||||
compound.setIntArray("StartPosNew", new int[]{x, y, z});
|
||||
}
|
||||
}
|
||||
if (npc.npcVersion == 13) {
|
||||
boolean bo = compound.getBoolean("HealthRegen");
|
||||
compound.setInteger("HealthRegen", bo ? 1 : 0);
|
||||
NBTTagCompound comp = compound.getCompoundTag("TransformStats");
|
||||
bo = comp.getBoolean("HealthRegen");
|
||||
comp.setInteger("HealthRegen", bo ? 1 : 0);
|
||||
compound.setTag("TransformStats", comp);
|
||||
|
||||
}
|
||||
npc.npcVersion = ModRev;
|
||||
}
|
||||
}
|
||||
npc.npcVersion = ModRev;
|
||||
}
|
||||
|
||||
public static void CheckModelCompatibility(EntityNPCInterface npc, NBTTagCompound compound){
|
||||
if(npc.npcVersion == ModRev)
|
||||
return;
|
||||
NBTTagCompound modelData = compound.getCompoundTag("NpcModelData");
|
||||
if(npc.npcVersion < 20){
|
||||
// Convert Puppet Job
|
||||
if (compound.hasKey("NpcJob")) {
|
||||
if(compound.getInteger("NpcJob") == 9){
|
||||
// Remove Job
|
||||
compound.setInteger("NpcJob", 0);
|
||||
public static void CheckModelCompatibility(EntityNPCInterface npc, NBTTagCompound compound) {
|
||||
if (npc.npcVersion == ModRev)
|
||||
return;
|
||||
NBTTagCompound modelData = compound.getCompoundTag("NpcModelData");
|
||||
if (npc.npcVersion < 20) {
|
||||
// Convert Puppet Job
|
||||
if (compound.hasKey("NpcJob")) {
|
||||
if (compound.getInteger("NpcJob") == 9) {
|
||||
// Remove Job
|
||||
compound.setInteger("NpcJob", 0);
|
||||
|
||||
// Get Puppet Data
|
||||
boolean moving = compound.getBoolean("PuppetMoving");
|
||||
boolean attacking = compound.getBoolean("PuppetAttacking");
|
||||
boolean standing = compound.getBoolean("PuppetStanding");
|
||||
NBTTagCompound head = compound.getCompoundTag("PuppetHead");
|
||||
NBTTagCompound body = compound.getCompoundTag("PuppetBody");
|
||||
NBTTagCompound larm = compound.getCompoundTag("PuppetLArm");
|
||||
NBTTagCompound rarm = compound.getCompoundTag("PuppetRArm");
|
||||
NBTTagCompound lleg = compound.getCompoundTag("PuppetLLeg");
|
||||
NBTTagCompound rleg = compound.getCompoundTag("PuppetRLeg");
|
||||
// Get Puppet Data
|
||||
boolean moving = compound.getBoolean("PuppetMoving");
|
||||
boolean attacking = compound.getBoolean("PuppetAttacking");
|
||||
boolean standing = compound.getBoolean("PuppetStanding");
|
||||
NBTTagCompound head = compound.getCompoundTag("PuppetHead");
|
||||
NBTTagCompound body = compound.getCompoundTag("PuppetBody");
|
||||
NBTTagCompound larm = compound.getCompoundTag("PuppetLArm");
|
||||
NBTTagCompound rarm = compound.getCompoundTag("PuppetRArm");
|
||||
NBTTagCompound lleg = compound.getCompoundTag("PuppetLLeg");
|
||||
NBTTagCompound rleg = compound.getCompoundTag("PuppetRLeg");
|
||||
|
||||
// Enable Rotations
|
||||
modelData.setBoolean("EnableRotation", true);
|
||||
// Make New Rotation and Write It
|
||||
ModelRotate newRotation = new ModelRotate();
|
||||
newRotation.whileMoving = moving;
|
||||
newRotation.whileAttacking = attacking;
|
||||
newRotation.whileStanding = standing;
|
||||
NBTTagCompound rotation = newRotation.writeToNBT();
|
||||
rotation.setTag("PuppetHead", head);
|
||||
rotation.setTag("PuppetBody", body);
|
||||
rotation.setTag("PuppetLArm", larm);
|
||||
rotation.setTag("PuppetRArm", rarm);
|
||||
rotation.setTag("PuppetLLeg", lleg);
|
||||
rotation.setTag("PuppetRLeg", rleg);
|
||||
modelData.setTag("ModelRotation", rotation);
|
||||
// Enable Rotations
|
||||
modelData.setBoolean("EnableRotation", true);
|
||||
// Make New Rotation and Write It
|
||||
ModelRotate newRotation = new ModelRotate();
|
||||
newRotation.whileMoving = moving;
|
||||
newRotation.whileAttacking = attacking;
|
||||
newRotation.whileStanding = standing;
|
||||
NBTTagCompound rotation = newRotation.writeToNBT();
|
||||
rotation.setTag("PuppetHead", head);
|
||||
rotation.setTag("PuppetBody", body);
|
||||
rotation.setTag("PuppetLArm", larm);
|
||||
rotation.setTag("PuppetRArm", rarm);
|
||||
rotation.setTag("PuppetLLeg", lleg);
|
||||
rotation.setTag("PuppetRLeg", rleg);
|
||||
modelData.setTag("ModelRotation", rotation);
|
||||
|
||||
// Remove All Old Tags
|
||||
compound.removeTag("PuppetMoving");
|
||||
compound.removeTag("PuppetAttacking");
|
||||
compound.removeTag("PuppetStanding");
|
||||
compound.removeTag("PuppetHead");
|
||||
compound.removeTag("PuppetBody");
|
||||
compound.removeTag("PuppetLArm");
|
||||
compound.removeTag("PuppetRArm");
|
||||
compound.removeTag("PuppetLLeg");
|
||||
compound.removeTag("PuppetRLeg");
|
||||
}
|
||||
}
|
||||
}
|
||||
if(npc.npcVersion < 19) {
|
||||
// Fix Leg MPM Dependency
|
||||
if(modelData.hasKey("LegParts")){
|
||||
NBTTagCompound legParts = modelData.getCompoundTag("LegParts");
|
||||
if(legParts.hasKey("Texture")){
|
||||
legParts.setString("Texture", legParts.getString("Texture").replace("moreplayermodels:textures", "customnpcs:textures/parts"));
|
||||
}
|
||||
modelData.setTag("LegParts", legParts);
|
||||
}
|
||||
// Remove All Old Tags
|
||||
compound.removeTag("PuppetMoving");
|
||||
compound.removeTag("PuppetAttacking");
|
||||
compound.removeTag("PuppetStanding");
|
||||
compound.removeTag("PuppetHead");
|
||||
compound.removeTag("PuppetBody");
|
||||
compound.removeTag("PuppetLArm");
|
||||
compound.removeTag("PuppetRArm");
|
||||
compound.removeTag("PuppetLLeg");
|
||||
compound.removeTag("PuppetRLeg");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (npc.npcVersion < 19) {
|
||||
// Fix Leg MPM Dependency
|
||||
if (modelData.hasKey("LegParts")) {
|
||||
NBTTagCompound legParts = modelData.getCompoundTag("LegParts");
|
||||
if (legParts.hasKey("Texture")) {
|
||||
legParts.setString("Texture", legParts.getString("Texture").replace("moreplayermodels:textures", "customnpcs:textures/parts"));
|
||||
}
|
||||
modelData.setTag("LegParts", legParts);
|
||||
}
|
||||
|
||||
// Fix Part MPM Dependency
|
||||
if(modelData.hasKey("Parts")){
|
||||
NBTTagList list = modelData.getTagList("Parts", 10);
|
||||
// Fix Part MPM Dependency
|
||||
if (modelData.hasKey("Parts")) {
|
||||
NBTTagList list = modelData.getTagList("Parts", 10);
|
||||
|
||||
for (int i = 0; i < list.tagCount(); i++) {
|
||||
NBTTagCompound item = list.getCompoundTagAt(i);
|
||||
for (int i = 0; i < list.tagCount(); i++) {
|
||||
NBTTagCompound item = list.getCompoundTagAt(i);
|
||||
|
||||
if(item.hasKey("Texture")){
|
||||
item.setString("Texture", item.getString("Texture").replace("moreplayermodels:textures", "customnpcs:textures/parts"));
|
||||
}
|
||||
list.func_150304_a(i, item);
|
||||
}
|
||||
modelData.setTag("Parts", list);
|
||||
}
|
||||
}
|
||||
compound.setTag("NpcModelData", modelData);
|
||||
}
|
||||
if (item.hasKey("Texture")) {
|
||||
item.setString("Texture", item.getString("Texture").replace("moreplayermodels:textures", "customnpcs:textures/parts"));
|
||||
}
|
||||
list.func_150304_a(i, item);
|
||||
}
|
||||
modelData.setTag("Parts", list);
|
||||
}
|
||||
}
|
||||
compound.setTag("NpcModelData", modelData);
|
||||
}
|
||||
|
||||
public static void CheckAvailabilityCompatibility(ICompatibilty compatibilty, NBTTagCompound compound){
|
||||
if(compatibilty.getVersion() == ModRev)
|
||||
return;
|
||||
CompatabilityFix(compound, compatibilty.writeToNBT(new NBTTagCompound()));
|
||||
public static void CheckAvailabilityCompatibility(ICompatibilty compatibilty, NBTTagCompound compound) {
|
||||
if (compatibilty.getVersion() == ModRev)
|
||||
return;
|
||||
CompatabilityFix(compound, compatibilty.writeToNBT(new NBTTagCompound()));
|
||||
|
||||
compatibilty.setVersion(ModRev);
|
||||
}
|
||||
private static void CompatabilityFix(NBTTagCompound compound,
|
||||
NBTTagCompound check) {
|
||||
Collection<String> tags = check.func_150296_c();
|
||||
for(String name : tags){
|
||||
NBTBase nbt = check.getTag(name);
|
||||
if(!compound.hasKey(name)){
|
||||
compound.setTag(name, nbt);
|
||||
}
|
||||
else if(nbt instanceof NBTTagCompound && compound.getTag(name) instanceof NBTTagCompound){
|
||||
CompatabilityFix(compound.getCompoundTag(name), (NBTTagCompound)nbt);
|
||||
}
|
||||
}
|
||||
}
|
||||
compatibilty.setVersion(ModRev);
|
||||
}
|
||||
|
||||
private static void CompatabilityFix(NBTTagCompound compound,
|
||||
NBTTagCompound check) {
|
||||
Collection<String> tags = check.func_150296_c();
|
||||
for (String name : tags) {
|
||||
NBTBase nbt = check.getTag(name);
|
||||
if (!compound.hasKey(name)) {
|
||||
compound.setTag(name, nbt);
|
||||
} else if (nbt instanceof NBTTagCompound && compound.getTag(name) instanceof NBTTagCompound) {
|
||||
CompatabilityFix(compound.getCompoundTag(name), (NBTTagCompound) nbt);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user