Merge pull request #21 from Blukzen/feature/4-configuration-files

feature/4-configuration-files

Author: brukzen

src/main/java/com/blukzen/createlab/CreateLab.java

@@ -4,7 +4,9 @@
 import com.blukzen.createlab.item.LabItems;
 import com.blukzen.createlab.util.GUIUtil;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import org.apache.logging.log4j.LogManager;
@@ -21,6 +23,7 @@ public CreateLab() {
         LabItems.ITEMS.register(modbus);
 
         FMLJavaModLoadingContext.get().getModEventBus().addListener(CreateLabRegistry::init);
+        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, CreateLabConfig.COMMON_SPEC, "createlab-common.toml");
 
         if (FMLEnvironment.dist.isClient()) {
             GUIUtil.INSTANCE = new GUIUtil();

src/main/java/com/blukzen/createlab/CreateLabConfig.java

@@ -0,0 +1,37 @@
+package com.blukzen.createlab;
+
+import net.minecraftforge.common.ForgeConfigSpec;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CreateLabConfig {
+    public static final ForgeConfigSpec COMMON_SPEC;
+
+    public static ForgeConfigSpec.ConfigValue<List<? extends String>> labPortalFrameBlocks;
+    public static ForgeConfigSpec.IntValue tpCommandPermissionLevel;
+    public static ForgeConfigSpec.IntValue debugCommandPermissionLevel;
+    public static ForgeConfigSpec.IntValue saveCommandPermissionLevel;
+
+    static {
+        ForgeConfigSpec.Builder configBuilder = new ForgeConfigSpec.Builder();
+        setupConfig(configBuilder);
+        COMMON_SPEC = configBuilder.build();
+    }
+
+    private static void setupConfig(ForgeConfigSpec.Builder builder) {
+        labPortalFrameBlocks = builder.comment("Blocks that can be used as a lab portal frame").defineList("lab_portal_frame_blocks", Arrays.asList("minecraft:smooth_quartz", "minecraft:quartz_block"), entry -> true);
+
+        builder.push("Command Permission Levels");
+        {
+            builder.comment("0 = All, 1 = OPs, 3 = Disabled");
+            tpCommandPermissionLevel = builder.defineInRange("tp_permission_level", 0, 0, 2);
+            debugCommandPermissionLevel = builder.defineInRange("debug_permission_level", 0, 0, 2);
+            saveCommandPermissionLevel = builder.defineInRange("save_permission_level", 0, 0, 2);
+        }
+        builder.pop();
+
+
+
+    }
+}

src/main/java/com/blukzen/createlab/commands/CommandDebug.java

@@ -1,5 +1,6 @@
 package com.blukzen.createlab.commands;
 
+import com.blukzen.createlab.CreateLabConfig;
 import com.blukzen.createlab.util.GUIUtil;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
@@ -24,7 +25,7 @@ public class CommandDebug implements Command<CommandSource>, SuggestionProvider<
 
     public static ArgumentBuilder<CommandSource, ?> register(CommandDispatcher<CommandSource> dispatcher) {
         return Commands.literal("debug")
-                .requires(cs -> cs.hasPermission(0))
+                .requires(cs -> cs.hasPermission(CreateLabConfig.debugCommandPermissionLevel.get()))
                 .executes(CMD)
                 .then(
                         RequiredArgumentBuilder.<CommandSource, String>argument("args", StringArgumentType.greedyString())

src/main/java/com/blukzen/createlab/commands/CommandSaveInventory.java

@@ -1,5 +1,6 @@
 package com.blukzen.createlab.commands;
 
+import com.blukzen.createlab.CreateLabConfig;
 import com.blukzen.createlab.data.LaboratoryCapability;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
@@ -15,7 +16,7 @@ public class CommandSaveInventory implements Command<CommandSource> {
 
     public static ArgumentBuilder<CommandSource, ?> register(CommandDispatcher<CommandSource> dispatcher) {
         return Commands.literal("save")
-                .requires(cs -> cs.hasPermission(0))
+                .requires(cs -> cs.hasPermission(CreateLabConfig.saveCommandPermissionLevel.get()))
                 .executes(CMD);
     }
 

src/main/java/com/blukzen/createlab/commands/CommandTeleport.java

@@ -1,5 +1,6 @@
 package com.blukzen.createlab.commands;
 
+import com.blukzen.createlab.CreateLabConfig;
 import com.blukzen.createlab.data.LaboratoryCapability;
 import com.blukzen.createlab.dimension.LabDimensions;
 import com.blukzen.createlab.util.TeleportationTools;
@@ -22,7 +23,7 @@ public class CommandTeleport implements Command<CommandSource> {
 
     public static ArgumentBuilder<CommandSource, ?> register(CommandDispatcher<CommandSource> dispatcher) {
         return Commands.literal("tp")
-                .requires(cs -> cs.hasPermission(0))
+                .requires(cs -> cs.hasPermission(CreateLabConfig.tpCommandPermissionLevel.get()))
                 .executes(CMD);
     }
 

src/main/java/com/blukzen/createlab/world/LabPortal.java

@@ -1,11 +1,11 @@
 package com.blukzen.createlab.world;
 
+import com.blukzen.createlab.CreateLabConfig;
 import com.blukzen.createlab.block.LabBlocks;
 import com.blukzen.createlab.block.LabPortalBlock;
 import com.blukzen.createlab.util.GUIUtil;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
@@ -17,9 +17,7 @@
 import java.util.function.Predicate;
 
 public class LabPortal {
-    private static final AbstractBlock.IPositionPredicate FRAME = (blockState, blockReader, blockPos) -> {
-        return blockState.getBlock().is(Blocks.SMOOTH_QUARTZ);
-    };
+    private static final AbstractBlock.IPositionPredicate FRAME = (blockState, blockReader, blockPos) -> CreateLabConfig.labPortalFrameBlocks.get().contains(blockState.getBlock().getRegistryName().toString());
     private final IWorld level;
     private final Direction.Axis axis;
     private final Direction rightDir;