Jm/entity collision

build.gradle

@@ -88,6 +88,8 @@ minecraft {
         client {
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', mod_id
+            // Set custom username
+            args "--username", "Dev####"
         }
 
         server {

src/main/java/com/amuzil/omegasource/magus/Magus.java

@@ -1,19 +1,18 @@
 package com.amuzil.omegasource.magus;
 
-import com.amuzil.omegasource.magus.input.*;
+import com.amuzil.omegasource.magus.entity.AvatarEntities;
+import com.amuzil.omegasource.magus.input.InputModule;
+import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule;
+import com.amuzil.omegasource.magus.input.MouseMotionModule;
 import com.amuzil.omegasource.magus.network.MagusNetwork;
 import com.amuzil.omegasource.magus.registry.Registries;
 import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry;
-import com.amuzil.omegasource.magus.skill.forms.Forms;
 import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry;
 import com.amuzil.omegasource.magus.skill.test.avatar.AvatarCommand;
-import com.amuzil.omegasource.magus.skill.test.avatar.AvatarEntities;
 import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.entity.EntityRenderers;
 import net.minecraft.client.renderer.entity.ThrownItemRenderer;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.server.ServerStartingEvent;
@@ -47,11 +46,6 @@ public class Magus {
     public static InputModule mouseMotionModule;
 
     public Magus() {
-        // Register ourselves for server and other game events we are interested in
-        MinecraftForge.EVENT_BUS.register(this);
-        //Register the input modules
-        keyboardMouseInputModule = new KeyboardMouseInputModule();
-        mouseMotionModule = new MouseMotionModule();
         // Register capabilities
         FMLJavaModLoadingContext.get().getModEventBus().addListener(CapabilityHandler::registerCapabilities);
         // attach capabilities
@@ -65,6 +59,9 @@ public Magus() {
         // Register the doClientStuff method for mod loading
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
 
+        // Register ourselves for server and other game events we are interested in
+        MinecraftForge.EVENT_BUS.register(this);
+
         // Register Testing Entities
         // NOTE: This is strictly for testing and to be deleted later
         AvatarEntities.register(FMLJavaModLoadingContext.get().getModEventBus());
@@ -75,13 +72,15 @@ private void setup(final FMLCommonSetupEvent event) {
         Registries.init();
         CapabilityHandler.initialiseCaps();
         MagusNetwork.registerMessages();
-        Forms.init();
     }
 
     private void doClientStuff(final FMLClientSetupEvent event) {
         // do something that can only be done on the client
-        //todo call this anytime the key mappings are updated
-        //Assign input data to forms
+        // Register the input modules
+        keyboardMouseInputModule = new KeyboardMouseInputModule();
+        mouseMotionModule = new MouseMotionModule();
+        // TODO - call this anytime the key mappings are updated
+        // Assign input data to forms
         FormDataRegistry.init();
         ModifiersRegistry.init();
     }
@@ -119,27 +118,12 @@ public static void onClientSetup(FMLClientSetupEvent event) {
             LOGGER.info("HELLO FROM CLIENT SETUP");
 
             KeyboardMouseInputModule.determineMotionKeys();
-            EntityRenderers.register(AvatarEntities.TEST_PROJECTILE.get(), ThrownItemRenderer::new);
+            EntityRenderers.register(AvatarEntities.AIR_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new);
+            EntityRenderers.register(AvatarEntities.WATER_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new);
+            EntityRenderers.register(AvatarEntities.EARTH_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new);
+            EntityRenderers.register(AvatarEntities.FIRE_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new);
 
             LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
         }
     }
-
-    // Send a message to in-game chat
-    public static void sendDebugMsg(String msg) {
-        Minecraft minecraft = Minecraft.getInstance();
-        if (minecraft == null) {
-            System.err.println("sendDebugMsg failed: Minecraft instance is null");
-            return;
-        }
-        minecraft.execute(() -> {
-            LocalPlayer player = minecraft.player;
-            if (player != null) {
-                Component text = Component.literal(msg);
-                player.sendSystemMessage(text);
-            } else {
-                System.err.println("sendDebugMsg failed: player is null");
-            }
-        });
-    }
 }

src/main/java/com/amuzil/omegasource/magus/entity/AvatarEntities.java

@@ -0,0 +1,44 @@
+package com.amuzil.omegasource.magus.entity;
+
+import com.amuzil.omegasource.magus.Magus;
+import com.amuzil.omegasource.magus.entity.collision.ElementCollision;
+import com.amuzil.omegasource.magus.entity.projectile.AirProjectile;
+import com.amuzil.omegasource.magus.entity.projectile.EarthProjectile;
+import com.amuzil.omegasource.magus.entity.projectile.FireProjectile;
+import com.amuzil.omegasource.magus.entity.projectile.WaterProjectile;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+
+public class AvatarEntities {
+    public static final DeferredRegister<EntityType<?>> ENTITY_TYPES =
+            DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Magus.MOD_ID);
+
+    public static final RegistryObject<EntityType<AirProjectile>> AIR_PROJECTILE_ENTITY_TYPE =
+            ENTITY_TYPES.register("air_projectile", () -> EntityType.Builder.<AirProjectile>of(AirProjectile::new, MobCategory.MISC)
+                    .sized(0.5f, 0.5f).build("air_projectile"));
+
+    public static final RegistryObject<EntityType<WaterProjectile>> WATER_PROJECTILE_ENTITY_TYPE =
+            ENTITY_TYPES.register("water_projectile", () -> EntityType.Builder.<WaterProjectile>of(WaterProjectile::new, MobCategory.MISC)
+                    .sized(0.5f, 0.5f).build("water_projectile"));
+
+    public static final RegistryObject<EntityType<EarthProjectile>> EARTH_PROJECTILE_ENTITY_TYPE =
+            ENTITY_TYPES.register("earth_projectile", () -> EntityType.Builder.<EarthProjectile>of(EarthProjectile::new, MobCategory.MISC)
+                    .sized(0.5f, 0.5f).build("earth_projectile"));
+
+    public static final RegistryObject<EntityType<FireProjectile>> FIRE_PROJECTILE_ENTITY_TYPE =
+            ENTITY_TYPES.register("fire_projectile", () -> EntityType.Builder.<FireProjectile>of(FireProjectile::new, MobCategory.MISC)
+                    .sized(0.5f, 0.5f).build("fire_projectile"));
+
+    public static final RegistryObject<EntityType<ElementCollision>> COLLISION_ENTITY_TYPE =
+            ENTITY_TYPES.register("element_collision", () -> EntityType.Builder.<ElementCollision>of(ElementCollision::new, MobCategory.MISC)
+                    .sized(0.5f, 0.5f).build("element_collision"));
+
+    public static void register(IEventBus eventBus) {
+        ENTITY_TYPES.register(eventBus);
+    }
+}