Move base mod classes to common

Author: rubensworks

loader-common/src/main/java/org/cyclops/structuredcrafting/GeneralConfig.java

@@ -0,0 +1,17 @@
+package org.cyclops.structuredcrafting;
+
+import org.cyclops.cyclopscore.config.extendedconfig.DummyConfigCommon;
+import org.cyclops.cyclopscore.helper.ModBaseCommon;
+
+/**
+ * A config with general options for this mod.
+ * @author rubensworks
+ *
+ */
+public class GeneralConfig extends DummyConfigCommon<ModBaseCommon<?>> {
+
+    public GeneralConfig(ModBaseCommon<?> mod) {
+        super(mod, "general");
+    }
+
+}

…yclops/structuredcrafting/Reference.java …yclops/structuredcrafting/Reference.javaloader-neoforge/src/main/java/org/cyclops/structuredcrafting/Reference.java renamed to loader-common/src/main/java/org/cyclops/structuredcrafting/Reference.java loader-neoforge/src/main/java/org/cyclops/structuredcrafting/Reference.java renamed to loader-common/src/main/java/org/cyclops/structuredcrafting/Reference.java

@@ -1,7 +1,5 @@
 package org.cyclops.structuredcrafting;
 
-import org.cyclops.cyclopscore.helper.MinecraftHelpers;
-
 /**
  * Class that can hold basic static things that are better not hard-coded
  * like mod details, texture paths, ID's...
@@ -12,6 +10,5 @@ public final class Reference {
     // Mod info
     public static final String MOD_ID = "structuredcrafting";
     public static final String GA_TRACKING_ID = "UA-65307010-3";
-    public static final String VERSION_URL = "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + MinecraftHelpers.getMinecraftVersionMajorMinor() + "/StructuredCrafting.txt";
 
 }

loader-common/src/main/java/org/cyclops/structuredcrafting/RegistryEntriesCommon.java

@@ -0,0 +1,22 @@
+package org.cyclops.structuredcrafting;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import org.cyclops.cyclopscore.config.DeferredHolderCommon;
+
+/**
+ * Referenced registry entries.
+ * @author rubensworks
+ */
+public class RegistryEntriesCommon {
+
+    public static final DeferredHolderCommon<Item, Item> ITEM_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.ITEM, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+
+    public static final DeferredHolderCommon<Block, Block> BLOCK_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+
+    // TODO: when when move the following, rename this file
+//    public static final DeferredHolderCommon<BlockEntityType<?>, BlockEntityType<?>> BLOCK_ENTITY_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK_ENTITY_TYPE, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+
+}

loader-neoforge/src/main/java/org/cyclops/structuredcrafting/GeneralConfig.java

@@ -2,8 +2,6 @@
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.cyclops.structuredcrafting.blockentity.BlockEntityStructuredCrafter;
@@ -14,10 +12,6 @@
  */
 public class RegistryEntries {
 
-    public static final DeferredHolder<Item, Item> ITEM_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.ITEM, ResourceLocation.parse("structuredcrafting:structured_crafter"));
-
-    public static final DeferredHolder<Block, Block> BLOCK_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("structuredcrafting:structured_crafter"));
-
     public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<BlockEntityStructuredCrafter>> BLOCK_ENTITY_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.BLOCK_ENTITY_TYPE, ResourceLocation.parse("structuredcrafting:structured_crafter"));
 
 }

loader-neoforge/src/main/java/org/cyclops/structuredcrafting/RegistryEntries.java

@@ -68,14 +68,14 @@ protected ICommonProxy constructCommonProxy() {
     @Override
     protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
         return super.constructDefaultCreativeModeTab(builder)
-                .icon(() -> new ItemStack(RegistryEntries.ITEM_STRUCTURED_CRAFTER));
+                .icon(() -> new ItemStack(RegistryEntriesCommon.ITEM_STRUCTURED_CRAFTER));
     }
 
     @Override
     protected void onConfigsRegister(ConfigHandler configHandler) {
         super.onConfigsRegister(configHandler);
 
-        configHandler.addConfigurable(new GeneralConfig());
+        configHandler.addConfigurable(new GeneralConfig(this));
 
         configHandler.addConfigurable(new BlockStructuredCrafterConfig());
         configHandler.addConfigurable(new BlockEntityStructuredCrafterConfig());

loader-neoforge/src/main/java/org/cyclops/structuredcrafting/StructuredCrafting.java

@@ -51,7 +51,7 @@ protected MapCodec<? extends BaseEntityBlock> codec() {
     @Override
     @Nullable
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
-        return level.isClientSide ? null : createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER.get(), new BlockEntityStructuredCrafter.Ticker());
+        return level.isClientSide ? null : createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER.value(), new BlockEntityStructuredCrafter.Ticker());
     }
 
     @Override

loader-neoforge/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java

@@ -3,7 +3,7 @@
 import com.google.common.collect.Sets;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.cyclops.cyclopscore.config.extendedconfig.BlockEntityConfig;
-import org.cyclops.structuredcrafting.RegistryEntries;
+import org.cyclops.structuredcrafting.RegistryEntriesCommon;
 import org.cyclops.structuredcrafting.StructuredCrafting;
 
 /**
@@ -18,7 +18,7 @@ public BlockEntityStructuredCrafterConfig() {
                 StructuredCrafting._instance,
                 "structured_crafter",
                 (eConfig) -> new BlockEntityType<>(BlockEntityStructuredCrafter::new,
-                        Sets.newHashSet(RegistryEntries.BLOCK_STRUCTURED_CRAFTER.get()), null)
+                        Sets.newHashSet(RegistryEntriesCommon.BLOCK_STRUCTURED_CRAFTER.value()), null)
         );
     }