From 3e72e7b559f16dbe73165c23117c6ca61f10b3d7 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 24 Jan 2024 22:19:00 -0500 Subject: [PATCH] Best Naming Ever!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --- gradle.properties | 6 +++--- .../{cnpcplusgecko => npcgecko}/CommonProxy.java | 4 ++-- .../CustomNpcPlusGecko.java | 4 ++-- .../client/ClientProxy.java | 8 ++++---- .../client/gui/GuiStringSelection.java | 2 +- .../client/gui/SubGuiModelAnimation.java | 8 ++++---- .../client/model/ModelCustom.java | 4 ++-- .../client/renderer/RenderCustomModel.java | 6 +++--- .../data/CustomModelData.java | 2 +- .../entity/EntityCustomModel.java | 2 +- .../mixin/IDataDisplay.java | 4 ++-- .../mixin/impl/MixinDataDisplay.java | 8 ++++---- .../mixin/impl/MixinGeckoAddon.java | 8 ++++---- .../mixin/impl/MixinGeckoAddonClient.java | 12 ++++++------ .../utils/AnimationFileUtil.java | 2 +- .../utils/NpcTextureUtils.java | 2 +- .../{cnpcplusgecko_at.cfg => npcgecko_at.cfg} | 0 ...ixins.cnpcplusgecko.json => mixins.npcgecko.json} | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/CommonProxy.java (77%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/CustomNpcPlusGecko.java (76%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/client/ClientProxy.java (63%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/client/gui/GuiStringSelection.java (97%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/client/gui/SubGuiModelAnimation.java (95%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/client/model/ModelCustom.java (84%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/client/renderer/RenderCustomModel.java (96%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/data/CustomModelData.java (98%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/entity/EntityCustomModel.java (98%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/mixin/IDataDisplay.java (52%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/mixin/impl/MixinDataDisplay.java (88%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/mixin/impl/MixinGeckoAddon.java (87%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/mixin/impl/MixinGeckoAddonClient.java (91%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/utils/AnimationFileUtil.java (95%) rename src/main/java/com/goodbird/{cnpcplusgecko => npcgecko}/utils/NpcTextureUtils.java (99%) rename src/main/resources/META-INF/{cnpcplusgecko_at.cfg => npcgecko_at.cfg} (100%) rename src/main/resources/{mixins.cnpcplusgecko.json => mixins.npcgecko.json} (84%) diff --git a/gradle.properties b/gradle.properties index c3ef7b0..1c6fb92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ modName = CustomNPC-Plus-Gecko-Addon # This is a case-sensitive string to identify your mod. Convention is to use lower case. -modId = cnpcplusgecko +modId = npcgecko -modGroup = com.goodbird.cnpcplusgecko +modGroup = com.goodbird.npcgecko # WHY is there no version field? # The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the @@ -57,7 +57,7 @@ apiPackage = # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ # There can be multiple files in a space-separated list. # Example value: mymodid_at.cfg nei_at.cfg -accessTransformersFile = cnpcplusgecko_at.cfg +accessTransformersFile = npcgecko_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = true diff --git a/src/main/java/com/goodbird/cnpcplusgecko/CommonProxy.java b/src/main/java/com/goodbird/npcgecko/CommonProxy.java similarity index 77% rename from src/main/java/com/goodbird/cnpcplusgecko/CommonProxy.java rename to src/main/java/com/goodbird/npcgecko/CommonProxy.java index c73f051..ea7a912 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/CommonProxy.java +++ b/src/main/java/com/goodbird/npcgecko/CommonProxy.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/CustomNpcPlusGecko.java b/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java similarity index 76% rename from src/main/java/com/goodbird/cnpcplusgecko/CustomNpcPlusGecko.java rename to src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java index 7e36800..f457945 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/CustomNpcPlusGecko.java +++ b/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java @@ -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 diff --git a/src/main/java/com/goodbird/cnpcplusgecko/client/ClientProxy.java b/src/main/java/com/goodbird/npcgecko/client/ClientProxy.java similarity index 63% rename from src/main/java/com/goodbird/cnpcplusgecko/client/ClientProxy.java rename to src/main/java/com/goodbird/npcgecko/client/ClientProxy.java index da0f629..866a06b 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/client/ClientProxy.java +++ b/src/main/java/com/goodbird/npcgecko/client/ClientProxy.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/client/gui/GuiStringSelection.java b/src/main/java/com/goodbird/npcgecko/client/gui/GuiStringSelection.java similarity index 97% rename from src/main/java/com/goodbird/cnpcplusgecko/client/gui/GuiStringSelection.java rename to src/main/java/com/goodbird/npcgecko/client/gui/GuiStringSelection.java index c6a6f3e..b0d9415 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/client/gui/GuiStringSelection.java +++ b/src/main/java/com/goodbird/npcgecko/client/gui/GuiStringSelection.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/client/gui/SubGuiModelAnimation.java b/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java similarity index 95% rename from src/main/java/com/goodbird/cnpcplusgecko/client/gui/SubGuiModelAnimation.java rename to src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java index 326e127..49f742a 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/client/gui/SubGuiModelAnimation.java +++ b/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java @@ -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.*; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/client/model/ModelCustom.java b/src/main/java/com/goodbird/npcgecko/client/model/ModelCustom.java similarity index 84% rename from src/main/java/com/goodbird/cnpcplusgecko/client/model/ModelCustom.java rename to src/main/java/com/goodbird/npcgecko/client/model/ModelCustom.java index 4f46328..1849198 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/client/model/ModelCustom.java +++ b/src/main/java/com/goodbird/npcgecko/client/model/ModelCustom.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/client/renderer/RenderCustomModel.java b/src/main/java/com/goodbird/npcgecko/client/renderer/RenderCustomModel.java similarity index 96% rename from src/main/java/com/goodbird/cnpcplusgecko/client/renderer/RenderCustomModel.java rename to src/main/java/com/goodbird/npcgecko/client/renderer/RenderCustomModel.java index 8d51829..8b9e616 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/client/renderer/RenderCustomModel.java +++ b/src/main/java/com/goodbird/npcgecko/client/renderer/RenderCustomModel.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/data/CustomModelData.java b/src/main/java/com/goodbird/npcgecko/data/CustomModelData.java similarity index 98% rename from src/main/java/com/goodbird/cnpcplusgecko/data/CustomModelData.java rename to src/main/java/com/goodbird/npcgecko/data/CustomModelData.java index 0878d6e..66f78f9 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/data/CustomModelData.java +++ b/src/main/java/com/goodbird/npcgecko/data/CustomModelData.java @@ -1,4 +1,4 @@ -package com.goodbird.cnpcplusgecko.data; +package com.goodbird.npcgecko.data; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/entity/EntityCustomModel.java b/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java similarity index 98% rename from src/main/java/com/goodbird/cnpcplusgecko/entity/EntityCustomModel.java rename to src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java index c34189c..d23b741 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/entity/EntityCustomModel.java +++ b/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/mixin/IDataDisplay.java b/src/main/java/com/goodbird/npcgecko/mixin/IDataDisplay.java similarity index 52% rename from src/main/java/com/goodbird/cnpcplusgecko/mixin/IDataDisplay.java rename to src/main/java/com/goodbird/npcgecko/mixin/IDataDisplay.java index 13864f5..686a919 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/mixin/IDataDisplay.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/IDataDisplay.java @@ -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(); diff --git a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinDataDisplay.java b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinDataDisplay.java similarity index 88% rename from src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinDataDisplay.java rename to src/main/java/com/goodbird/npcgecko/mixin/impl/MixinDataDisplay.java index 215ca97..035bcae 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinDataDisplay.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinDataDisplay.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddon.java b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddon.java similarity index 87% rename from src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddon.java rename to src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddon.java index fee3f65..b792955 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddon.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddon.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddonClient.java b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddonClient.java similarity index 91% rename from src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddonClient.java rename to src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddonClient.java index 6f17565..db67dc9 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/mixin/impl/MixinGeckoAddonClient.java +++ b/src/main/java/com/goodbird/npcgecko/mixin/impl/MixinGeckoAddonClient.java @@ -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); })); diff --git a/src/main/java/com/goodbird/cnpcplusgecko/utils/AnimationFileUtil.java b/src/main/java/com/goodbird/npcgecko/utils/AnimationFileUtil.java similarity index 95% rename from src/main/java/com/goodbird/cnpcplusgecko/utils/AnimationFileUtil.java rename to src/main/java/com/goodbird/npcgecko/utils/AnimationFileUtil.java index f6098bf..cd0374a 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/utils/AnimationFileUtil.java +++ b/src/main/java/com/goodbird/npcgecko/utils/AnimationFileUtil.java @@ -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; diff --git a/src/main/java/com/goodbird/cnpcplusgecko/utils/NpcTextureUtils.java b/src/main/java/com/goodbird/npcgecko/utils/NpcTextureUtils.java similarity index 99% rename from src/main/java/com/goodbird/cnpcplusgecko/utils/NpcTextureUtils.java rename to src/main/java/com/goodbird/npcgecko/utils/NpcTextureUtils.java index 7fba717..900fb50 100644 --- a/src/main/java/com/goodbird/cnpcplusgecko/utils/NpcTextureUtils.java +++ b/src/main/java/com/goodbird/npcgecko/utils/NpcTextureUtils.java @@ -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; diff --git a/src/main/resources/META-INF/cnpcplusgecko_at.cfg b/src/main/resources/META-INF/npcgecko_at.cfg similarity index 100% rename from src/main/resources/META-INF/cnpcplusgecko_at.cfg rename to src/main/resources/META-INF/npcgecko_at.cfg diff --git a/src/main/resources/mixins.cnpcplusgecko.json b/src/main/resources/mixins.npcgecko.json similarity index 84% rename from src/main/resources/mixins.cnpcplusgecko.json rename to src/main/resources/mixins.npcgecko.json index 3b13d3a..a51bd37 100644 --- a/src/main/resources/mixins.cnpcplusgecko.json +++ b/src/main/resources/mixins.npcgecko.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.7.11", - "package": "com.goodbird.cnpcplusgecko.mixin.impl", + "package": "com.goodbird.npcgecko.mixin.impl", "refmap": "mixins.cnpcplusgecko.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8",