update to 1.18.2-40.0.2

CHANGELOG.md

@@ -3,9 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
-## [1.18.1-1.1.0.0] - ????-??-??
+## [1.18.2-1.1.0.0] - 2022-03-03
 ### Changed
-- Update mod to Forge 1.18.1-39.0.0
+- Update mod to Forge 1.18.2-40.0.2 (fix Log4J security issue)
 
 ## [1.18-1.0.2.0] - 2021-12-10
 ### Changed

build.gradle

@@ -7,15 +7,13 @@ buildscript {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
-
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 plugins {
+    id 'eclipse'
+    id 'maven-publish'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
-
 apply plugin: 'net.minecraftforge.gradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
 
 version = "${minecraft_version}-${mod_version}"
 group = "cech12.${mod_id}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -42,14 +40,9 @@ minecraft {
         client {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
-
-            //added to avoid "Invalid module name: '' is not a Java identifier" error
-            property 'legacyClassPath', '{minecraft_classpath}'
+            property 'forge.enabledGameTestNamespaces', "${mod_id}"
 
             mods {
                 solarcooker {
@@ -61,11 +54,26 @@ minecraft {
         server {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', "${mod_id}"
+
+            mods {
+                solarcooker {
+                    source sourceSets.main
+                }
+            }
+        }
 
-            // Recommended logging level for the console
+        // This run config launches GameTestServer and runs all registered gametests, then exits.
+        // By default, the server will crash when no gametests are provided.
+        // The gametest system is also enabled by default for other run configs under the /test command.
+        gameTestServer {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', "${mod_id}"
 
             mods {
                 solarcooker {
@@ -77,14 +85,12 @@ minecraft {
         data {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', "${mod_id}"
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'solarcooker', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', "${mod_id}", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
                 solarcooker {

gradle.properties

@@ -5,13 +5,13 @@ org.gradle.daemon=false
 
 mod_id=solarcooker
 mod_version=1.1.0.0
-minecraft_version=1.18.1
-forge_version=39.0.0
+minecraft_version=1.18.2
+forge_version=40.0.2
 
 # jei
-jei_version=1.18.1:9.1.0.41
+jei_version=1.18.2:9.4.1.113
 
 #Curseforge
 curseforge_id=436874
 curseforge_release=release
-curseforge_versions=1.18.1
+curseforge_versions=1.18.2

src/main/java/cech12/solarcooker/init/ModTags.java

@@ -1,6 +1,9 @@
 package cech12.solarcooker.init;
 
 import cech12.solarcooker.SolarCookerMod;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.Tag;
@@ -11,10 +14,10 @@ public class ModTags {
 
     public static class Blocks {
 
-        public static final Tag.Named<Block> SOLAR_COOKER_SHINING = tag("solar_cooker_shining");
+        public static final TagKey<Block> SOLAR_COOKER_SHINING = tag("solar_cooker_shining");
 
-        private static Tag.Named<Block> tag(@Nonnull String name) {
-            return BlockTags.bind(SolarCookerMod.MOD_ID + ":" + name);
+        private static TagKey<Block> tag(@Nonnull String name) {
+            return TagKey.create(Registry.BLOCK_REGISTRY, new ResourceLocation(SolarCookerMod.MOD_ID, name));
         }
     }
 }

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[39,)"
+loaderVersion="[40,)"
 issueTrackerURL="https://github.com/cech12/BrickShears/issues"
 license="The MIT License (MIT)"
 [[mods]]
@@ -15,18 +15,18 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
     modId="forge"
     mandatory=true
-    versionRange="[39.0.0,)"
+    versionRange="[40.0.2,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.18.1,)"
+    versionRange="[1.18.2,1.19)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]
    modId="jei"
    mandatory=false
-   versionRange="[9.1.0.41,)"
+   versionRange="[9.4.1.113,)"
    ordering="NONE"
    side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Solar Cooker resources",
-        "pack_format": 8
+        "pack_format": 9
     }
 }