mirror of
https://github.com/KAMKEEL/CustomNPC-Gecko-Addon.git
synced 2026-11-20 06:29:42 +00:00
Best Naming Ever!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
This commit is contained in:
1 parent
70d93d561c
commit
3e72e7b559
18 files changed
+42
-42
No files matched your search
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.goodbird.cnpcplusgecko;
|
||||
package com.goodbird.npcgecko;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko;
|
||||
package com.goodbird.npcgecko;
|
||||
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
@@ -10,7 +10,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
dependencies = "required-after:customnpcs;required-after:geckolib3")
|
||||
public class CustomNpcPlusGecko {
|
||||
|
||||
@SidedProxy(clientSide = "com.goodbird.cnpcplusgecko.client.ClientProxy", serverSide = "com.goodbird.cnpcplusgecko.CommonProxy")
|
||||
@SidedProxy(clientSide = "com.goodbird.npcgecko.client.ClientProxy", serverSide = "com.goodbird.npcgecko.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
@Mod.Instance
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.goodbird.cnpcplusgecko.client;
|
||||
package com.goodbird.npcgecko.client;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.CommonProxy;
|
||||
import com.goodbird.cnpcplusgecko.client.renderer.RenderCustomModel;
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.CommonProxy;
|
||||
import com.goodbird.npcgecko.client.renderer.RenderCustomModel;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko.client.gui;
|
||||
package com.goodbird.npcgecko.client.gui;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.goodbird.cnpcplusgecko.client.gui;
|
||||
package com.goodbird.npcgecko.client.gui;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.data.CustomModelData;
|
||||
import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.cnpcplusgecko.utils.AnimationFileUtil;
|
||||
import com.goodbird.npcgecko.data.CustomModelData;
|
||||
import com.goodbird.npcgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.npcgecko.utils.AnimationFileUtil;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import noppes.npcs.client.gui.util.*;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.goodbird.cnpcplusgecko.client.model;
|
||||
package com.goodbird.npcgecko.client.model;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import software.bernie.geckolib3.model.AnimatedGeoModel;
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.goodbird.cnpcplusgecko.client.renderer;
|
||||
package com.goodbird.npcgecko.client.renderer;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.client.model.ModelCustom;
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.client.model.ModelCustom;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko.data;
|
||||
package com.goodbird.npcgecko.data;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko.entity;
|
||||
package com.goodbird.npcgecko.entity;
|
||||
|
||||
import net.minecraft.entity.EntityCreature;
|
||||
import net.minecraft.entity.ai.EntityAIWatchClosest;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.goodbird.cnpcplusgecko.mixin;
|
||||
package com.goodbird.npcgecko.mixin;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.data.CustomModelData;
|
||||
import com.goodbird.npcgecko.data.CustomModelData;
|
||||
|
||||
public interface IDataDisplay {
|
||||
CustomModelData getCustomModelData();
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.goodbird.cnpcplusgecko.mixin.impl;
|
||||
package com.goodbird.npcgecko.mixin.impl;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.data.CustomModelData;
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.npcgecko.data.CustomModelData;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.mixin.IDataDisplay;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.DataDisplay;
|
||||
import noppes.npcs.entity.EntityCustomNpc;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.goodbird.cnpcplusgecko.mixin.impl;
|
||||
package com.goodbird.npcgecko.mixin.impl;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.cnpcplusgecko.utils.NpcTextureUtils;
|
||||
import com.goodbird.npcgecko.entity.EntityCustomModel;
|
||||
import com.goodbird.npcgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.npcgecko.utils.NpcTextureUtils;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import kamkeel.addon.GeckoAddon;
|
||||
+6
-6
@@ -1,8 +1,8 @@
|
||||
package com.goodbird.cnpcplusgecko.mixin.impl;
|
||||
package com.goodbird.npcgecko.mixin.impl;
|
||||
|
||||
import com.goodbird.cnpcplusgecko.client.gui.GuiStringSelection;
|
||||
import com.goodbird.cnpcplusgecko.client.gui.SubGuiModelAnimation;
|
||||
import com.goodbird.cnpcplusgecko.mixin.IDataDisplay;
|
||||
import com.goodbird.npcgecko.client.gui.GuiStringSelection;
|
||||
import com.goodbird.npcgecko.client.gui.SubGuiModelAnimation;
|
||||
import com.goodbird.npcgecko.mixin.IDataDisplay;
|
||||
import kamkeel.addon.client.GeckoAddonClient;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
@@ -39,7 +39,7 @@ public class MixinGeckoAddonClient {
|
||||
if(!supportEnabled)
|
||||
return;
|
||||
|
||||
if(EntityList.getEntityString(entity).equals("cnpcplusgecko.CustomModelEntity") || EntityList.getEntityString(entity).equals("Geckolib Model")){
|
||||
if(EntityList.getEntityString(entity).equals("npcgecko.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()));
|
||||
}
|
||||
}
|
||||
@@ -58,7 +58,7 @@ public class MixinGeckoAddonClient {
|
||||
for(ResourceLocation resLoc : GeckoLibCache.getInstance().getGeoModels().keySet()){
|
||||
list.add(resLoc.toString());
|
||||
}
|
||||
creationScreen.setSubGui(new GuiStringSelection(creationScreen,"Selecting geckolib model:", list, name -> {
|
||||
creationScreen.setSubGui(new GuiStringSelection(creationScreen,"Selecting GeckoLib Model:", list, name -> {
|
||||
((IDataDisplay)creationScreen.npc.display).getCustomModelData().setModel(name);
|
||||
creationScreen.getButton(202).setDisplayText(name);
|
||||
}));
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko.utils;
|
||||
package com.goodbird.npcgecko.utils;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import software.bernie.geckolib3.core.builder.Animation;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.goodbird.cnpcplusgecko.utils;
|
||||
package com.goodbird.npcgecko.utils;
|
||||
|
||||
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
|
||||
import net.minecraft.client.Minecraft;
|
||||
Reference in new issue
Block a user