refactor: Move FluidInteractionHelper out of data/ directory

Doesn't really make sense to have this on data directory
null2264 · Dec 5, 2023 · d1419d7 · d1419d7
1 parent 4502ecf
commit d1419d7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/io/github/null2264/cobblegen/CobbleGen.java b/src/main/java/io/github/null2264/cobblegen/CobbleGen.java
@@ -5,7 +5,6 @@
 import io.github.null2264.cobblegen.compat.LoaderCompat;
 import io.github.null2264.cobblegen.compat.TextCompat;
 import io.github.null2264.cobblegen.config.ConfigMetaData;
-import io.github.null2264.cobblegen.data.FluidInteractionHelper;
 import io.github.null2264.cobblegen.data.model.CGRegistry;
 import io.github.null2264.cobblegen.util.CGLog;
 import net.minecraft.commands.CommandSourceStack;
@@ -36,7 +35,7 @@ public class CobbleGen implements net.fabricmc.api.ModInitializer
      */
     @Deprecated
     @ApiStatus.Internal
-    public static final FluidInteractionHelper FLUID_INTERACTION = new FluidInteractionHelper();
+    public static final FluidInteraction FLUID_INTERACTION = new FluidInteraction();
     private static final Path configPath = LoaderCompat.getConfigDir();
     private static final File configFile = new File(configPath + File.separator + MOD_ID + "-meta.json5");
     @ApiStatus.Internal

diff --git a/...obblegen/data/FluidInteractionHelper.java → .../null2264/cobblegen/FluidInteraction.java b/...obblegen/data/FluidInteractionHelper.java → .../null2264/cobblegen/FluidInteraction.java
@@ -1,8 +1,7 @@
-package io.github.null2264.cobblegen.data;
+package io.github.null2264.cobblegen;
 
 import com.google.common.collect.ImmutableList;
-import io.github.null2264.cobblegen.CobbleGen;
-import io.github.null2264.cobblegen.CobbleGenPlugin;
+import io.github.null2264.cobblegen.data.CGRegistryImpl;
 import io.github.null2264.cobblegen.data.model.CGRegistry;
 import io.github.null2264.cobblegen.data.model.Generator;
 import io.github.null2264.cobblegen.util.CGLog;
@@ -13,7 +12,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.LevelEvent;
@@ -37,12 +35,8 @@
 /**
  * Replacement for BlockGenerator. This will act like Vanilla's registry system
  */
-public class FluidInteractionHelper
+public class FluidInteraction
 {
-    public static final ImmutableList<Direction> FLOW_DIRECTIONS = ImmutableList.of(
-            Direction.DOWN, Direction.SOUTH, Direction.NORTH, Direction.EAST, Direction.WEST
-    );
-
     private final Map<Fluid, List<Generator>> generatorMap = new HashMap<>();
     private @Nullable Map<Fluid, List<Generator>> serverGeneratorMap = null;
 

diff --git a/src/main/java/io/github/null2264/cobblegen/data/model/BlockGenerator.java b/src/main/java/io/github/null2264/cobblegen/data/model/BlockGenerator.java
@@ -9,7 +9,7 @@
 
 import java.util.Optional;
 
-import static io.github.null2264.cobblegen.data.FluidInteractionHelper.FLOW_DIRECTIONS;
+import static io.github.null2264.cobblegen.util.Constants.FLOW_DIRECTIONS;
 
 @ApiStatus.Internal
 public abstract class BlockGenerator implements BuiltInGenerator

diff --git a/src/main/java/io/github/null2264/cobblegen/util/Constants.java b/src/main/java/io/github/null2264/cobblegen/util/Constants.java
@@ -1,5 +1,7 @@
 package io.github.null2264.cobblegen.util;
 
+import com.google.common.collect.ImmutableList;
+import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 
@@ -36,4 +38,8 @@ public static String fromBlock(Block block) {
             return fromId(Util.getBlockId(block));
         }
     }
+
+    public static final ImmutableList<Direction> FLOW_DIRECTIONS = ImmutableList.of(
+            Direction.DOWN, Direction.SOUTH, Direction.NORTH, Direction.EAST, Direction.WEST
+    );
 }