Updated to latest forgegradle, incremented minor version, added command base

jtljac · jtljac · commit 5aaa4712ac40 · 2021-09-19T01:37:53.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -1,31 +1,36 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
+        // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
+        maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
-
 apply plugin: 'net.minecraftforge.gradle'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
-version = "1.2.1"
-group = "com.demmodders.datmoddingapi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "datmoddingapi"
+version = "1.3.0"
+group = "com.demmodders" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+java {
+    archivesBaseName = "datmoddingapi"
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
+}
 
 minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
+    // The mappings can be changed at any time and must be in the following format.
+    // Channel:   Version:
+    // snapshot   YYYYMMDD   Snapshot are built nightly.
+    // stable     #          Stables are built at the discretion of the MCP team.
+    // official   MCVersion  Official field/method names from Mojang mapping files
+    //
+    // You must be aware of the Mojang license when using the 'official' mappings.
+    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+    //
+    // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
     mappings channel: 'stable', version: '39-1.12'
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -36,13 +41,19 @@ minecraft {
             workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be added/removed as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
             // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                datannouncements {
+                randomspawn2 {
                     source sourceSets.main
                 }
             }
@@ -52,30 +63,34 @@ minecraft {
             workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // The markers can be added/removed as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
             // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                datannouncements {
+                randomspawn2 {
                     source sourceSets.main
                 }
             }
         }
     }
 }
 
+// Include resources generated by data generators.
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854'
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2855'
 }
 
 jar.finalizedBy('reobfJar')
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/demmodders/datmoddingapi/DatModdingAPI.java b/src/main/java/com/demmodders/datmoddingapi/DatModdingAPI.java
@@ -12,7 +12,7 @@ public class DatModdingAPI
 {
     public static final String MODID = "datmoddingapi";
     public static final String NAME = "Dat Modding API";
-    public static final String VERSION = "1.2.1";
+    public static final String VERSION = "1.3.0";
     public static final String MC_VERSION = "[1.12.2]";
 
     @Mod.EventHandler
diff --git a/src/main/java/com/demmodders/datmoddingapi/commands/DatCommandBase.java b/src/main/java/com/demmodders/datmoddingapi/commands/DatCommandBase.java
@@ -0,0 +1,49 @@
+package com.demmodders.datmoddingapi.commands;
+
+import com.demmodders.datmoddingapi.util.DemConstants;
+import com.demmodders.datmoddingapi.util.Permissions;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+
+public abstract class DatCommandBase extends CommandBase {
+    /**
+     * Sends the given message to the given recipient
+     * @param recipient The ICommandSender (console, player, etc) receiving the message
+     * @param message The message being sent to the ICommandSender
+     */
+    protected void sendMessage(ICommandSender recipient, ITextComponent message) {
+        recipient.sendMessage(message);
+    }
+
+    /**
+     * Sends an informational message to the given recipient
+     * @param recipient The ICommandSender (console, player, etc) receiving the message
+     * @param message The message being sent to the ICommandSender
+     */
+    protected void sendInfo(ICommandSender recipient, String message) {
+        sendMessage(recipient, new TextComponentString(DemConstants.TextColour.INFO + message));
+    }
+
+    /**
+     * Sends an error message to the given recipient
+     * @param recipient The ICommandSender (console, player, etc) receiving the message
+     * @param message The message being sent to the ICommandSender
+     */
+    protected void sendError(ICommandSender recipient, String message) {
+        sendMessage(recipient, new TextComponentString(DemConstants.TextColour.ERROR + message));
+    }
+
+    /**
+     * Gets the permission node for this command
+     * @return The permission node
+     */
+    protected abstract String getPermissionNode();
+
+    @Override
+    public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
+        return Permissions.checkPermission(sender, getPermissionNode(), getRequiredPermissionLevel());
+    }
+}
diff --git a/src/main/java/com/demmodders/datmoddingapi/util/BlockPosUtil.java b/src/main/java/com/demmodders/datmoddingapi/util/BlockPosUtil.java
@@ -1,40 +1,48 @@
-package com.demmodders.datmoddingapi.util;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-
-public class BlockPosUtil {
-    public static BlockPos findSafeZ(int Dim, BlockPos blockPos, int maxDistance){
-        BlockPos test = new BlockPos(blockPos);
-        World world = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(Dim);
-        if (world.getBlockState(blockPos).getMaterial().blocksMovement()) {
-            while (test.getY() < blockPos.getY() + maxDistance){
-                test = test.up();
-                if (!world.getBlockState(test).getMaterial().blocksMovement()){
-                    if (!world.getBlockState(test.up()).getMaterial().blocksMovement()){
-                        return test;
-                    } else {
-                        test = test.up();
-                    }
-                }
-            }
-        } else if (!world.getBlockState(blockPos.down()).getMaterial().blocksMovement() && !world.getBlockState(blockPos.down()).getMaterial().isLiquid()){
-            while (test.getY() > blockPos.getY() - maxDistance){
-                test = test.down();
-                if (test.getY() < 0) {
-                    return null;
-                } else if (!world.getBlockState(test).getMaterial().blocksMovement()){
-                    if (!world.getBlockState(test.down()).getMaterial().blocksMovement()){
-                        return test.up();
-                    } else {
-                        test = test.down();
-                    }
-                }
-            }
-        } else {
-            return blockPos;
-        }
-        return null;
-    }
-}
+package com.demmodders.datmoddingapi.util;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+
+public class BlockPosUtil {
+    /**
+     * Finds a safe location along the z axis
+     * Warning, thuis function isn't very good or well written, I'd avoid it
+     * @param Dim The dimension the position is in
+     * @param blockPos The starting position
+     * @param maxDistance The maximum distance to search
+     * @return A safe blockpos, or null
+     */
+    public static BlockPos findSafeZ(int Dim, BlockPos blockPos, int maxDistance){
+        BlockPos test = new BlockPos(blockPos);
+        World world = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(Dim);
+        if (world.getBlockState(blockPos).getMaterial().blocksMovement()) {
+            while (test.getY() < blockPos.getY() + maxDistance){
+                test = test.up();
+                if (!world.getBlockState(test).getMaterial().blocksMovement()){
+                    if (!world.getBlockState(test.up()).getMaterial().blocksMovement()){
+                        return test;
+                    } else {
+                        test = test.up();
+                    }
+                }
+            }
+        } else if (!world.getBlockState(blockPos.down()).getMaterial().blocksMovement() && !world.getBlockState(blockPos.down()).getMaterial().isLiquid()){
+            while (test.getY() > blockPos.getY() - maxDistance){
+                test = test.down();
+                if (test.getY() < 0) {
+                    return null;
+                } else if (!world.getBlockState(test).getMaterial().blocksMovement()){
+                    if (!world.getBlockState(test.down()).getMaterial().blocksMovement()){
+                        return test.up();
+                    } else {
+                        test = test.down();
+                    }
+                }
+            }
+        } else {
+            return blockPos;
+        }
+        return null;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class DatModdingAPI`
`12`	`12`	`{`
`13`	`13`	`public static final String MODID = "datmoddingapi";`
`14`	`14`	`public static final String NAME = "Dat Modding API";`
`15`		`- public static final String VERSION = "1.2.1";`
	`15`	`+ public static final String VERSION = "1.3.0";`
`16`	`16`	`public static final String MC_VERSION = "[1.12.2]";`
`17`	`17`
`18`	`18`	`@Mod.EventHandler`