Fix Naming scheme to better fit future addons

src/main/java/com/goodbird/cnpcplusgecko/CommonProxy.java

@@ -1,12 +1,12 @@
-package com.goodbird.cnpcgeckoaddon;
+package com.goodbird.cnpcplusgecko;
 
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class CommonProxy {
 
     public void preInit(FMLPreInitializationEvent ev){
-        EntityRegistry.registerModEntity(EntityCustomModel.class, "CustomModelEntity", 0, CNPCGeckoAddon.instance, 64, 10, false);
+        EntityRegistry.registerModEntity(EntityCustomModel.class, "CustomModelEntity", 0, CustomNpcPlusGecko.instance, 64, 10, false);
     }
 }

src/main/java/com/goodbird/cnpcplusgecko/CustomNpcPlusGecko.java

@@ -1,20 +1,20 @@
-package com.goodbird.cnpcgeckoaddon;
+package com.goodbird.cnpcplusgecko;
 
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
-@Mod(modid = "cnpcgeckoaddon",
-    name = "CustomNPC Gecko Addon",
+@Mod(modid = "customnpc-plus-gecko",
+    name = "CustomNPC+ Gecko Addon",
     version = "1.0",
     dependencies = "required-after:customnpcs;required-after:geckolib3")
-public class CNPCGeckoAddon {
+public class CustomNpcPlusGecko {
 
-    @SidedProxy(clientSide = "com.goodbird.cnpcgeckoaddon.client.ClientProxy", serverSide = "com.goodbird.cnpcgeckoaddon.CommonProxy")
+    @SidedProxy(clientSide = "com.goodbird.cnpcplusgecko.client.ClientProxy", serverSide = "com.goodbird.cnpcplusgecko.CommonProxy")
     public static CommonProxy proxy;
 
     @Mod.Instance
-    public static CNPCGeckoAddon instance;
+    public static CustomNpcPlusGecko instance;
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent ev) {

src/main/java/com/goodbird/cnpcplusgecko/client/ClientProxy.java

@@ -1,8 +1,8 @@
-package com.goodbird.cnpcgeckoaddon.client;
+package com.goodbird.cnpcplusgecko.client;
 
-import com.goodbird.cnpcgeckoaddon.CommonProxy;
-import com.goodbird.cnpcgeckoaddon.client.renderer.RenderCustomModel;
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.CommonProxy;
+import com.goodbird.cnpcplusgecko.client.renderer.RenderCustomModel;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 

src/main/java/com/goodbird/cnpcplusgecko/client/gui/GuiStringSelection.java

@@ -1,4 +1,4 @@
-package com.goodbird.cnpcgeckoaddon.client.gui;
+package com.goodbird.cnpcplusgecko.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;

src/main/java/com/goodbird/cnpcplusgecko/client/gui/SubGuiModelAnimation.java

@@ -1,8 +1,8 @@
-package com.goodbird.cnpcgeckoaddon.client.gui;
+package com.goodbird.cnpcplusgecko.client.gui;
 
-import com.goodbird.cnpcgeckoaddon.data.CustomModelData;
-import com.goodbird.cnpcgeckoaddon.mixin.IDataDisplay;
-import com.goodbird.cnpcgeckoaddon.utils.AnimationFileUtil;
+import com.goodbird.cnpcplusgecko.data.CustomModelData;
+import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
+import com.goodbird.cnpcplusgecko.utils.AnimationFileUtil;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.client.gui.util.*;

src/main/java/com/goodbird/cnpcplusgecko/client/model/ModelCustom.java

@@ -1,6 +1,6 @@
-package com.goodbird.cnpcgeckoaddon.client.model;
+package com.goodbird.cnpcplusgecko.client.model;
 
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
 import net.minecraft.util.ResourceLocation;
 import software.bernie.geckolib3.model.AnimatedGeoModel;
 

src/main/java/com/goodbird/cnpcplusgecko/client/renderer/RenderCustomModel.java

@@ -1,7 +1,7 @@
-package com.goodbird.cnpcgeckoaddon.client.renderer;
+package com.goodbird.cnpcplusgecko.client.renderer;
 
-import com.goodbird.cnpcgeckoaddon.client.model.ModelCustom;
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.client.model.ModelCustom;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;

src/main/java/com/goodbird/cnpcplusgecko/data/CustomModelData.java

@@ -1,4 +1,4 @@
-package com.goodbird.cnpcgeckoaddon.data;
+package com.goodbird.cnpcplusgecko.data;
 
 import net.minecraft.nbt.NBTTagCompound;
 

src/main/java/com/goodbird/cnpcplusgecko/entity/EntityCustomModel.java

@@ -1,4 +1,4 @@
-package com.goodbird.cnpcgeckoaddon.entity;
+package com.goodbird.cnpcplusgecko.entity;
 
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.ai.EntityAIWatchClosest;

src/main/java/com/goodbird/cnpcplusgecko/mixin/IDataDisplay.java

@@ -1,6 +1,6 @@
-package com.goodbird.cnpcgeckoaddon.mixin;
+package com.goodbird.cnpcplusgecko.mixin;
 
-import com.goodbird.cnpcgeckoaddon.data.CustomModelData;
+import com.goodbird.cnpcplusgecko.data.CustomModelData;
 
 public interface IDataDisplay {
     CustomModelData getCustomModelData();

src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinDataDisplay.java

@@ -1,8 +1,8 @@
-package com.goodbird.cnpcgeckoaddon.mixin.impl;
+package com.goodbird.cnpcplusgecko.mixin.impl;
 
-import com.goodbird.cnpcgeckoaddon.data.CustomModelData;
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
-import com.goodbird.cnpcgeckoaddon.mixin.IDataDisplay;
+import com.goodbird.cnpcplusgecko.data.CustomModelData;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.DataDisplay;
 import noppes.npcs.entity.EntityCustomNpc;

src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddon.java

@@ -1,17 +1,15 @@
-package com.goodbird.cnpcgeckoaddon.mixin.impl;
+package com.goodbird.cnpcplusgecko.mixin.impl;
 
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
-import com.goodbird.cnpcgeckoaddon.mixin.IDataDisplay;
-import com.goodbird.cnpcgeckoaddon.utils.NpcTextureUtils;
+import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
+import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
+import com.goodbird.cnpcplusgecko.utils.NpcTextureUtils;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
 import kamkeel.addon.GeckoAddon;
-import noppes.npcs.entity.EntityCustomNpc;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(GeckoAddon.class)
 public class MixinGeckoAddon {

src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddonClient.java

@@ -1,11 +1,8 @@
-package com.goodbird.cnpcgeckoaddon.mixin.impl;
+package com.goodbird.cnpcplusgecko.mixin.impl;
 
-import com.goodbird.cnpcgeckoaddon.client.gui.GuiStringSelection;
-import com.goodbird.cnpcgeckoaddon.client.gui.SubGuiModelAnimation;
-import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel;
-import com.goodbird.cnpcgeckoaddon.mixin.IDataDisplay;
-import com.goodbird.cnpcgeckoaddon.utils.NpcTextureUtils;
-import kamkeel.addon.GeckoAddon;
+import com.goodbird.cnpcplusgecko.client.gui.GuiStringSelection;
+import com.goodbird.cnpcplusgecko.client.gui.SubGuiModelAnimation;
+import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
 import kamkeel.addon.client.GeckoAddonClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBase;
@@ -23,7 +20,6 @@ import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import software.bernie.geckolib3.core.IAnimatable;
 import software.bernie.geckolib3.resource.GeckoLibCache;
 
@@ -43,7 +39,7 @@ public class MixinGeckoAddonClient {
         if(!supportEnabled)
             return;
 
-        if(EntityList.getEntityString(entity).equals("cnpcgeckoaddon.CustomModelEntity") || EntityList.getEntityString(entity).equals("Geckolib Model")){
+        if(EntityList.getEntityString(entity).equals("cnpcplusgecko.CustomModelEntity") || EntityList.getEntityString(entity).equals("Geckolib Model")){
             creationScreen.addButton(new GuiNpcButton(202, creationScreen.guiLeft-60, creationScreen.guiTop+40, 180, 20, ((IDataDisplay)creationScreen.npc.display).getCustomModelData().getModel()));
         }
     }

src/main/java/com/goodbird/cnpcplusgecko/utils/AnimationFileUtil.java

@@ -1,4 +1,4 @@
-package com.goodbird.cnpcgeckoaddon.utils;
+package com.goodbird.cnpcplusgecko.utils;
 
 import net.minecraft.util.ResourceLocation;
 import software.bernie.geckolib3.core.builder.Animation;

src/main/java/com/goodbird/cnpcplusgecko/utils/NpcTextureUtils.java

@@ -1,4 +1,4 @@
-package com.goodbird.cnpcgeckoaddon.utils;
+package com.goodbird.cnpcplusgecko.utils;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import net.minecraft.client.Minecraft;