Split up registration class, create core package, more small issues

CompactMods · Dec 4, 2021 · 5c12669 · 5c12669
1 parent af3f6a7
commit 5c12669
Show file tree

Hide file tree

Showing 49 changed files with 520 additions and 512 deletions.
diff --git a/src/api/java/dev/compactmods/crafting/api/field/IActiveWorldFields.java b/src/api/java/dev/compactmods/crafting/api/field/IActiveWorldFields.java
@@ -3,12 +3,14 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.ListTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
+import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.common.util.LazyOptional;
 
-public interface IActiveWorldFields {
+public interface IActiveWorldFields extends INBTSerializable<ListTag> {
 
     void setLevel(Level level);
 

diff --git a/src/api/java/dev/compactmods/crafting/api/field/IMiniaturizationField.java b/src/api/java/dev/compactmods/crafting/api/field/IMiniaturizationField.java
@@ -6,12 +6,14 @@
 import dev.compactmods.crafting.api.recipe.IMiniaturizationRecipe;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
+import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.common.util.LazyOptional;
 
-public interface IMiniaturizationField {
+public interface IMiniaturizationField extends INBTSerializable<Tag> {
 
     default void dispose() {}
 

diff --git a/src/main/java/dev/compactmods/crafting/CompactCrafting.java b/src/main/java/dev/compactmods/crafting/CompactCrafting.java
@@ -2,6 +2,7 @@
 
 import dev.compactmods.crafting.client.ClientConfig;
 import dev.compactmods.crafting.client.ui.container.ContainerRegistration;
+import dev.compactmods.crafting.core.*;
 import dev.compactmods.crafting.network.NetworkHandler;
 import dev.compactmods.crafting.recipes.components.ComponentRegistration;
 import dev.compactmods.crafting.server.ServerConfig;
@@ -36,7 +37,12 @@ public CompactCrafting() {
         mlCtx.registerConfig(ModConfig.Type.CLIENT, ClientConfig.CONFIG);
         mlCtx.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG);
 
-        Registration.init();
+        CCBlocks.init(modBus);
+        CCCatalystTypes.init(modBus);
+        CCItems.init(modBus);
+        CCLayerTypes.init(modBus);
+        CCMiniaturizationRecipes.init(modBus);
+
         ComponentRegistration.init(modBus);
         ContainerRegistration.init(modBus);
     }
@@ -53,7 +59,7 @@ public CCItemGroup() {
 
         @Override
         public ItemStack makeIcon() {
-            return new ItemStack(Registration.FIELD_PROJECTOR_ITEM.get());
+            return new ItemStack(CCItems.FIELD_PROJECTOR_ITEM.get());
         }
     }
 }
diff --git a/src/main/java/dev/compactmods/crafting/Registration.java b/src/main/java/dev/compactmods/crafting/Registration.java
diff --git a/src/main/java/dev/compactmods/crafting/client/ClientEventHandler.java b/src/main/java/dev/compactmods/crafting/client/ClientEventHandler.java
@@ -7,7 +7,7 @@
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import dev.compactmods.crafting.capability.CapabilityProjectorRenderInfo;
 import dev.compactmods.crafting.capability.IProjectorRenderInfo;
-import dev.compactmods.crafting.field.capability.CapabilityActiveWorldFields;
+import dev.compactmods.crafting.core.CCCapabilities;
 import dev.compactmods.crafting.field.render.CraftingPreviewRenderer;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
@@ -39,7 +39,7 @@ public static void onTick(final TickEvent.ClientTickEvent evt) {
 
         ClientLevel level = Minecraft.getInstance().level;
         if (level != null && !Minecraft.getInstance().isPaused()) {
-            level.getCapability(CapabilityActiveWorldFields.FIELDS)
+            level.getCapability(CCCapabilities.FIELDS)
                     .ifPresent(IActiveWorldFields::tickFields);
         }
     }
@@ -59,7 +59,7 @@ public static void onWorldRender(final RenderLevelLastEvent event) {
 
         double viewDistance = 64;
         final MultiBufferSource.BufferSource buffers = mc.renderBuffers().bufferSource();
-        mc.level.getCapability(CapabilityActiveWorldFields.FIELDS)
+        mc.level.getCapability(CCCapabilities.FIELDS)
                 .ifPresent(fields -> {
                     fields.getFields()
                             .filter(field -> Vec3.atCenterOf(field.getCenter()).closerThan(mainCamera.getPosition(), viewDistance))

diff --git a/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java b/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java
@@ -5,16 +5,16 @@
 import java.util.stream.Stream;
 import dev.compactmods.crafting.CompactCrafting;
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
+import dev.compactmods.crafting.core.CCCapabilities;
 import dev.compactmods.crafting.field.MiniaturizationField;
-import dev.compactmods.crafting.field.capability.CapabilityActiveWorldFields;
 import dev.compactmods.crafting.projector.FieldProjectorBlock;
-import dev.compactmods.crafting.projector.FieldProjectorTile;
-import net.minecraft.world.level.block.state.BlockState;
+import dev.compactmods.crafting.projector.FieldProjectorEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
 
 public abstract class ClientPacketHandler {
 
@@ -28,7 +28,7 @@ public static void handleFieldActivation(IMiniaturizationField field, CompoundTa
             field.setLevel(cw);
             field.loadClientData(fieldClientData);
 
-            mc.level.getCapability(CapabilityActiveWorldFields.FIELDS)
+            mc.level.getCapability(CCCapabilities.FIELDS)
                     .ifPresent(fields -> fields.registerField(field));
         });
     }
@@ -37,7 +37,7 @@ public static void handleFieldDeactivation(BlockPos center) {
         Minecraft mc = Minecraft.getInstance();
         mc.submitAsync(() -> {
             ClientLevel cw = mc.level;
-            cw.getCapability(CapabilityActiveWorldFields.FIELDS).ifPresent(fields -> {
+            cw.getCapability(CCCapabilities.FIELDS).ifPresent(fields -> {
                 fields.get(center).map(IMiniaturizationField::getProjectorPositions)
                         .orElse(Stream.empty())
                         .forEach(proj -> FieldProjectorBlock.deactivateProjector(cw, proj));
@@ -56,7 +56,7 @@ public static void handleFieldData(CompoundTag fieldData) {
         field.setLevel(mc.level);
         field.loadClientData(fieldData);
 
-        mc.level.getCapability(CapabilityActiveWorldFields.FIELDS)
+        mc.level.getCapability(CCCapabilities.FIELDS)
                 .ifPresent(fields -> {
                     fields.setLevel(mc.level);
                     CompactCrafting.LOGGER.debug("Registering field on client");
@@ -66,7 +66,7 @@ public static void handleFieldData(CompoundTag fieldData) {
 
                     field.getProjectorPositions()
                             .map(mc.level::getBlockEntity)
-                            .map(tile -> (FieldProjectorTile) tile)
+                            .map(tile -> (FieldProjectorEntity) tile)
                             .filter(Objects::nonNull)
                             .forEach(tile -> {
                                 final BlockState state = tile.getBlockState();
@@ -80,7 +80,7 @@ public static void removeField(BlockPos fieldCenter) {
         if (mc.level == null)
             return;
 
-        mc.level.getCapability(CapabilityActiveWorldFields.FIELDS)
+        mc.level.getCapability(CCCapabilities.FIELDS)
                 .ifPresent(fields -> fields.unregisterField(fieldCenter));
     }
 
@@ -89,7 +89,7 @@ public static void handleRecipeChanged(BlockPos center, @Nullable ResourceLocati
         if (mc.level == null)
             return;
 
-        mc.level.getCapability(CapabilityActiveWorldFields.FIELDS)
+        mc.level.getCapability(CCCapabilities.FIELDS)
                 .lazyMap(af -> af.get(center))
                 .ifPresent(field -> field.ifPresent(f -> f.setRecipe(recipe)));
     }