Update names and how files are structured

This was planned for awhile and it is finally done.
Elite-Modding-Team · Aug 21, 2024 · d66751a · d66751a
1 parent c926cd5
commit d66751a
Show file tree

Hide file tree

Showing 33 changed files with 257 additions and 246 deletions.
diff --git a/...rimsonrevelations/CrimsonRevelations.java → ...sonrevelations/NewCrimsonRevelations.java b/...rimsonrevelations/CrimsonRevelations.java → ...sonrevelations/NewCrimsonRevelations.java
@@ -1,9 +1,9 @@
 package mod.icarus.crimsonrevelations;
 
-import mod.icarus.crimsonrevelations.compat.CompatHandler;
+import mod.icarus.crimsonrevelations.compat.CRCompatHandler;
 import mod.icarus.crimsonrevelations.init.CRCreativeTabs;
-import mod.icarus.crimsonrevelations.init.RenderingHandler;
-import mod.icarus.crimsonrevelations.init.ResearchHandler;
+import mod.icarus.crimsonrevelations.init.CRRenderRegistry;
+import mod.icarus.crimsonrevelations.init.CRResearchRegistry;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -13,31 +13,31 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-@Mod(modid = CrimsonRevelations.MODID, name = CrimsonRevelations.NAME, version = CrimsonRevelations.VERSION, dependencies = CrimsonRevelations.DEPENDENCIES)
-public class CrimsonRevelations {
+@Mod(modid = NewCrimsonRevelations.MODID, name = NewCrimsonRevelations.NAME, version = NewCrimsonRevelations.VERSION, dependencies = NewCrimsonRevelations.DEPENDENCIES)
+public class NewCrimsonRevelations {
     public static final String MODID = Tags.MOD_ID;
     public static final String NAME = "New Crimson Revelations";
     public static final String VERSION = Tags.VERSION;
     public static final String DEPENDENCIES = "required-after:mixinbooter@[8.0,);required-after:thaumcraft@[1.12.2-6.1.BETA26,);after:thaumicaugmentation";
     public static final CreativeTabs tabCR = new CRCreativeTabs(CreativeTabs.CREATIVE_TAB_ARRAY.length, "CrimsonRevelationsTab");
 
     @Mod.Instance
-    public static CrimsonRevelations instance;
+    public static NewCrimsonRevelations instance;
 
     @EventHandler
     @SideOnly(Side.CLIENT)
     public void preInit(FMLPreInitializationEvent event) {
-        RenderingHandler.preInit();
+        CRRenderRegistry.preInit();
     }
 
     @EventHandler
     public void init(FMLInitializationEvent event) {
-        CompatHandler.init();
-        ResearchHandler.init();
+        CRCompatHandler.init();
+        CRResearchRegistry.init();
     }
 
     @EventHandler
     public void postinit(FMLPostInitializationEvent event) {
-        CompatHandler.postInit();
+        CRCompatHandler.postInit();
     }
 }
diff --git a/...s/item/foci/FocusEffectBlindingFlash.java → ...asters/foci/FocusEffectBlindingFlash.java b/...s/item/foci/FocusEffectBlindingFlash.java → ...asters/foci/FocusEffectBlindingFlash.java
@@ -1,7 +1,7 @@
-package mod.icarus.crimsonrevelations.item.foci;
+package mod.icarus.crimsonrevelations.casters.foci;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
-import mod.icarus.crimsonrevelations.init.SoundHandler;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
+import mod.icarus.crimsonrevelations.init.CRSoundEvents;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -32,7 +32,7 @@ public Aspect getAspect() {
 
     @Override
     public String getKey() {
-        return "focus." + CrimsonRevelations.MODID + ".blinding_flash";
+        return "focus." + NewCrimsonRevelations.MODID + ".blinding_flash";
     }
 
     @Override
@@ -58,7 +58,7 @@ public String getResearch() {
     @Override
     public boolean execute(final RayTraceResult target, final Trajectory trajectory, final float finalPower, final int num) {
         PacketHandler.INSTANCE.sendToAllAround(new PacketFXFocusPartImpact(target.hitVec.x, target.hitVec.y, target.hitVec.z, new String[]{this.getKey()}), new NetworkRegistry.TargetPoint(this.getPackage().world.provider.getDimension(), target.hitVec.x, target.hitVec.y, target.hitVec.z, 64.0D));
-        this.getPackage().world.playSound(null, target.hitVec.x, target.hitVec.y, target.hitVec.z, SoundHandler.FOCUS_BLINDING_LIGHT_HIT, SoundCategory.PLAYERS, 0.8F, 1.0F + (float) (this.getPackage().world.rand.nextGaussian() * 0.05F));
+        this.getPackage().world.playSound(null, target.hitVec.x, target.hitVec.y, target.hitVec.z, CRSoundEvents.FOCUS_BLINDING_LIGHT_HIT, SoundCategory.PLAYERS, 0.8F, 1.0F + (float) (this.getPackage().world.rand.nextGaussian() * 0.05F));
 
         if (target.typeOfHit == RayTraceResult.Type.ENTITY && target.entityHit != null) {
             final int duration = 20 * this.getSettingValue("duration");
@@ -85,7 +85,7 @@ public boolean execute(final RayTraceResult target, final Trajectory trajectory,
 
     @Override
     public void onCast(Entity caster) {
-        caster.world.playSound(null, caster.getPosition().up(), SoundHandler.FOCUS_BLINDING_LIGHT_SHOOT, SoundCategory.PLAYERS, 1.2F, 1.0F + caster.world.rand.nextFloat() * 0.1F);
+        caster.world.playSound(null, caster.getPosition().up(), CRSoundEvents.FOCUS_BLINDING_LIGHT_SHOOT, SoundCategory.PLAYERS, 1.2F, 1.0F + caster.world.rand.nextFloat() * 0.1F);
     }
 
     @Override

diff --git a/...elations/item/foci/FocusEffectPoison.java → ...tions/casters/foci/FocusEffectPoison.java b/...elations/item/foci/FocusEffectPoison.java → ...tions/casters/foci/FocusEffectPoison.java
@@ -1,6 +1,6 @@
-package mod.icarus.crimsonrevelations.item.foci;
+package mod.icarus.crimsonrevelations.casters.foci;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.MobEffects;
@@ -30,7 +30,7 @@ public Aspect getAspect() {
 
     @Override
     public String getKey() {
-        return "focus." + CrimsonRevelations.MODID + ".poison";
+        return "focus." + NewCrimsonRevelations.MODID + ".poison";
     }
 
     @Override

diff --git a/...ons/item/foci/FocusEffectTaintPoison.java → .../casters/foci/FocusEffectTaintPoison.java b/...ons/item/foci/FocusEffectTaintPoison.java → .../casters/foci/FocusEffectTaintPoison.java
@@ -1,6 +1,6 @@
-package mod.icarus.crimsonrevelations.item.foci;
+package mod.icarus.crimsonrevelations.casters.foci;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.potion.PotionEffect;
@@ -30,7 +30,7 @@ public Aspect getAspect() {
 
     @Override
     public String getKey() {
-        return "focus." + CrimsonRevelations.MODID + ".taint_poison";
+        return "focus." + NewCrimsonRevelations.MODID + ".taint_poison";
     }
 
     @Override

diff --git a/src/main/java/mod/icarus/crimsonrevelations/client/renderer/RenderOvergrownTaintacle.java b/src/main/java/mod/icarus/crimsonrevelations/client/renderer/RenderOvergrownTaintacle.java
@@ -1,6 +1,6 @@
 package mod.icarus.crimsonrevelations.client.renderer;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import mod.icarus.crimsonrevelations.entity.boss.EntityOvergrownTaintacle;
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
@@ -11,7 +11,7 @@
 
 @SideOnly(Side.CLIENT)
 public class RenderOvergrownTaintacle extends RenderLiving<EntityOvergrownTaintacle> {
-    public static final ResourceLocation TEXTURES = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/overgrown_taintacle.png");
+    public static final ResourceLocation TEXTURES = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/overgrown_taintacle.png");
 
     public RenderOvergrownTaintacle(RenderManager renderManager) {
         super(renderManager, new ModelTaintacle(12, false), 0.8F);

diff --git a/src/main/java/mod/icarus/crimsonrevelations/client/renderer/RenderPrimalArrow.java b/src/main/java/mod/icarus/crimsonrevelations/client/renderer/RenderPrimalArrow.java
@@ -1,6 +1,6 @@
 package mod.icarus.crimsonrevelations.client.renderer;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import mod.icarus.crimsonrevelations.entity.projectile.EntityPrimalArrow;
 import net.minecraft.client.renderer.entity.RenderArrow;
 import net.minecraft.client.renderer.entity.RenderManager;
@@ -10,12 +10,12 @@
 
 @SideOnly(Side.CLIENT)
 public class RenderPrimalArrow extends RenderArrow<EntityPrimalArrow> {
-    public static final ResourceLocation TEXTURE_AER = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_aer.png");
-    public static final ResourceLocation TEXTURE_AQUA = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_aqua.png");
-    public static final ResourceLocation TEXTURE_IGNIS = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_ignis.png");
-    public static final ResourceLocation TEXTURE_ORDO = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_ordo.png");
-    public static final ResourceLocation TEXTURE_PERDITIO = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_perditio.png");
-    public static final ResourceLocation TEXTURE_TERRA = new ResourceLocation(CrimsonRevelations.MODID, "textures/entity/arrow/arrow_terra.png");
+    public static final ResourceLocation TEXTURE_AER = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_aer.png");
+    public static final ResourceLocation TEXTURE_AQUA = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_aqua.png");
+    public static final ResourceLocation TEXTURE_IGNIS = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_ignis.png");
+    public static final ResourceLocation TEXTURE_ORDO = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_ordo.png");
+    public static final ResourceLocation TEXTURE_PERDITIO = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_perditio.png");
+    public static final ResourceLocation TEXTURE_TERRA = new ResourceLocation(NewCrimsonRevelations.MODID, "textures/entity/arrow/arrow_terra.png");
 
     public RenderPrimalArrow(RenderManager renderManager) {
         super(renderManager);

diff --git a/...msonrevelations/compat/CompatHandler.java → ...onrevelations/compat/CRCompatHandler.java b/...msonrevelations/compat/CompatHandler.java → ...onrevelations/compat/CRCompatHandler.java
@@ -1,17 +1,17 @@
 package mod.icarus.crimsonrevelations.compat;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import mod.icarus.crimsonrevelations.compat.jer.JERIntegration;
 import mod.icarus.crimsonrevelations.compat.thaumicaugmentation.TAIntegration;
-import mod.icarus.crimsonrevelations.core.CRConfig;
+import mod.icarus.crimsonrevelations.config.CRConfig;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.EntityEntry;
 
-@Mod.EventBusSubscriber(modid = CrimsonRevelations.MODID)
-public class CompatHandler {
+@Mod.EventBusSubscriber(modid = NewCrimsonRevelations.MODID)
+public class CRCompatHandler {
     @SubscribeEvent
     public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
     }

diff --git a/src/main/java/mod/icarus/crimsonrevelations/compat/jer/JERIntegration.java b/src/main/java/mod/icarus/crimsonrevelations/compat/jer/JERIntegration.java
@@ -4,9 +4,9 @@
 import jeresources.api.IMobRegistry;
 import jeresources.api.conditionals.LightLevel;
 import jeresources.compatibility.JERAPI;
-import mod.icarus.crimsonrevelations.core.CRConfig;
+import mod.icarus.crimsonrevelations.config.CRConfig;
 import mod.icarus.crimsonrevelations.entity.boss.EntityOvergrownTaintacle;
-import mod.icarus.crimsonrevelations.init.LootTableHandler;
+import mod.icarus.crimsonrevelations.init.CRLootTables;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.Loader;
 import thaumcraft.common.entities.monster.cult.EntityCultistPortalLesser;
@@ -17,8 +17,8 @@ public static void init() {
         IMobRegistry jerMobRegistry = jerApi.getMobRegistry();
         World jerWorld = jerApi.getWorld();
 
-        jerMobRegistry.register(new EntityCultistPortalLesser(jerWorld), LightLevel.any, 40, LootTableHandler.LESSER_CULTIST_PORTAL);
+        jerMobRegistry.register(new EntityCultistPortalLesser(jerWorld), LightLevel.any, 40, CRLootTables.LESSER_CULTIST_PORTAL);
         if (Loader.isModLoaded("thaumicaugmentation") && CRConfig.general_settings.TA_INTEGRATION)
-            jerMobRegistry.register(new EntityOvergrownTaintacle(jerWorld), LightLevel.any, new String[] {"Tainted Lands"}, LootTableHandler.OVERGROWN_TAINTACLE);
+            jerMobRegistry.register(new EntityOvergrownTaintacle(jerWorld), LightLevel.any, new String[] {"Tainted Lands"}, CRLootTables.OVERGROWN_TAINTACLE);
     }
 }
diff --git a/src/main/java/mod/icarus/crimsonrevelations/compat/thaumicaugmentation/TAIntegration.java b/src/main/java/mod/icarus/crimsonrevelations/compat/thaumicaugmentation/TAIntegration.java
@@ -1,6 +1,6 @@
 package mod.icarus.crimsonrevelations.compat.thaumicaugmentation;
 
-import mod.icarus.crimsonrevelations.core.CRConfig;
+import mod.icarus.crimsonrevelations.config.CRConfig;
 import mod.icarus.crimsonrevelations.entity.boss.EntityOvergrownTaintacle;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraftforge.fml.common.registry.EntityRegistry;

diff --git a/...rus/crimsonrevelations/core/CRConfig.java → ...s/crimsonrevelations/config/CRConfig.java b/...rus/crimsonrevelations/core/CRConfig.java → ...s/crimsonrevelations/config/CRConfig.java
@@ -1,13 +1,13 @@
-package mod.icarus.crimsonrevelations.core;
+package mod.icarus.crimsonrevelations.config;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-@Config(modid = CrimsonRevelations.MODID, name = CrimsonRevelations.NAME)
+@Config(modid = NewCrimsonRevelations.MODID, name = NewCrimsonRevelations.NAME)
 public class CRConfig {
     @Config.Comment("General")
     public static GeneralSettings general_settings = new GeneralSettings();
@@ -52,12 +52,12 @@ public static class TAIntegrationSettings {
         public int TAINT_SWARM_WEIGHT = 20;
     }
 
-    @Mod.EventBusSubscriber(modid = CrimsonRevelations.MODID)
+    @Mod.EventBusSubscriber(modid = NewCrimsonRevelations.MODID)
     public static class EventHandler {
         @SubscribeEvent
         public static void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent event) {
-            if (event.getModID().equals(CrimsonRevelations.MODID)) {
-                ConfigManager.sync(CrimsonRevelations.MODID, Config.Type.INSTANCE);
+            if (event.getModID().equals(NewCrimsonRevelations.MODID)) {
+                ConfigManager.sync(NewCrimsonRevelations.MODID, Config.Type.INSTANCE);
             }
         }
     }

diff --git a/src/main/java/mod/icarus/crimsonrevelations/entity/EntityCultistArcher.java b/src/main/java/mod/icarus/crimsonrevelations/entity/EntityCultistArcher.java
@@ -1,6 +1,6 @@
 package mod.icarus.crimsonrevelations.entity;
 
-import mod.icarus.crimsonrevelations.init.RegistryHandler;
+import mod.icarus.crimsonrevelations.init.CRRegistry;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
@@ -56,9 +56,9 @@ protected void applyEntityAttributes() {
 
     @Override
     protected void setLoot(DifficultyInstance diff) {
-        this.setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(RegistryHandler.crimsonArcherHelmet));
-        this.setItemStackToSlot(EntityEquipmentSlot.CHEST, new ItemStack(RegistryHandler.crimsonArcherChestplate));
-        this.setItemStackToSlot(EntityEquipmentSlot.LEGS, new ItemStack(RegistryHandler.crimsonArcherGreaves));
+        this.setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(CRRegistry.crimsonArcherHelmet));
+        this.setItemStackToSlot(EntityEquipmentSlot.CHEST, new ItemStack(CRRegistry.crimsonArcherChestplate));
+        this.setItemStackToSlot(EntityEquipmentSlot.LEGS, new ItemStack(CRRegistry.crimsonArcherGreaves));
         this.setItemStackToSlot(EntityEquipmentSlot.FEET, new ItemStack(ItemsTC.crimsonBoots));
         this.setHeldItem(this.getActiveHand(), new ItemStack(Items.BOW));
     }

diff --git a/src/main/java/mod/icarus/crimsonrevelations/entity/boss/EntityOvergrownTaintacle.java b/src/main/java/mod/icarus/crimsonrevelations/entity/boss/EntityOvergrownTaintacle.java
@@ -1,7 +1,7 @@
 package mod.icarus.crimsonrevelations.entity.boss;
 
-import mod.icarus.crimsonrevelations.core.CRConfig;
-import mod.icarus.crimsonrevelations.init.LootTableHandler;
+import mod.icarus.crimsonrevelations.config.CRConfig;
+import mod.icarus.crimsonrevelations.init.CRLootTables;
 import net.minecraft.entity.IEntityLivingData;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
@@ -177,7 +177,7 @@ protected void onDeathUpdate() {
     @Override
     @Nullable
     protected ResourceLocation getLootTable() {
-        return LootTableHandler.OVERGROWN_TAINTACLE;
+        return CRLootTables.OVERGROWN_TAINTACLE;
     }
 
     @Override

diff --git a/...crimsonrevelations/init/EventHandler.java → ...s/crimsonrevelations/events/CREvents.java b/...crimsonrevelations/init/EventHandler.java → ...s/crimsonrevelations/events/CREvents.java
@@ -1,26 +1,26 @@
-package mod.icarus.crimsonrevelations.init;
+package mod.icarus.crimsonrevelations.events;
 
-import mod.icarus.crimsonrevelations.CrimsonRevelations;
-import mod.icarus.crimsonrevelations.item.ItemCRBow;
+import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
+import mod.icarus.crimsonrevelations.item.CRItemBow;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraftforge.client.event.FOVUpdateEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
-@EventBusSubscriber(modid = CrimsonRevelations.MODID)
-@GameRegistry.ObjectHolder(CrimsonRevelations.MODID)
-public class EventHandler {
+@EventBusSubscriber(modid = NewCrimsonRevelations.MODID)
+@GameRegistry.ObjectHolder(NewCrimsonRevelations.MODID)
+public class CREvents {
     // Courtesy of NeRdTheNed
     @SubscribeEvent
     public void FOV(FOVUpdateEvent event) {
         final EntityPlayer eventPlayer = event.getEntity();
         final Item eventItem = eventPlayer.getActiveItemStack().getItem();
 
-        if (eventItem instanceof ItemCRBow) {
+        if (eventItem instanceof CRItemBow) {
             float finalFov = event.getFov();
-            final float itemUseCount = ((ItemCRBow) eventItem).getMaxItemUseDuration(eventPlayer.getActiveItemStack()) - eventPlayer.getItemInUseCount();
+            final float itemUseCount = ((CRItemBow) eventItem).getMaxItemUseDuration(eventPlayer.getActiveItemStack()) - eventPlayer.getItemInUseCount();
             /*
              * First, we have to reverse the standard bow zoom.
              * Minecraft helpfully applies the standard bow zoom
@@ -50,7 +50,7 @@ public void FOV(FOVUpdateEvent event) {
              * is that we change the hardcoded value of 20.0F to
              * whatever drawTime is.
              */
-            float drawTime = 20 * ((ItemCRBow) eventItem).drawTimeMult;
+            float drawTime = 20 * ((CRItemBow) eventItem).drawTimeMult;
             float customBow = itemUseCount / drawTime;
 
             if (customBow > 1.0F) {