Merge pull request #2 from OptimusZeGaming/develop-1.12.2

new mods version to mixin 8.5

.gitignore

@@ -25,8 +25,10 @@ bin/
 # macos
 *.DS_Store
 
-# forge
-forge*changelog.txt
+# neoforge
+runs
+run-data
+repo
 
 # other
 eclipse/

build.gradle

@@ -8,10 +8,7 @@ buildscript {
         classpath "org.spongepowered:mixingradle:0.7.+"
     }
 }
-plugins {
-    id "com.matthewprenger.cursegradle" version "1.4.0"
-    id "com.modrinth.minotaur" version "2.+"
-}
+
 apply plugin: "net.minecraftforge.gradle"
 apply plugin: "eclipse"
 apply plugin: "org.spongepowered.mixin"
@@ -28,9 +25,6 @@ println("Java: " + System.getProperty("java.version") + " JVM: " + System.getPro
 compileJava.options.compilerArgs.add '-parameters'
 
 repositories {
-    maven {
-        url "https://www.cursemaven.com"
-    }
     maven {
         url = "https://repo.spongepowered.org/maven"
     }
@@ -209,73 +203,6 @@ tasks.whenTaskAdded {
         it.dependsOn "prepareDataResources"
 }
 
-// CurseGradle settings for uploading to CurseForge
-curseforge {
-    project {
-        // Get the CurseForge token from the environment variables
-        apiKey = System.getenv("CURSEFORGE_TOKEN")
-        // Copy settings from gradle.properties
-        id = project.curseforge_project_id
-        releaseType = project.curseforge_release_type
-        project.curseforge_game_versions.split(" ").each it::addGameVersion
-        addGameVersion("Forge")
-        addGameVersion("NeoForge")
-        // Point to 'changelog' setting to a the changelog file
-        changelog = file("changelog.md")
-        changelogType = "markdown"
-        if (!project.curseforge_required_dependency_ids.isEmpty() || !project.curseforge_optional_dependency_ids.isEmpty()) {
-            relations {
-                // Required dependencies
-                if (!project.curseforge_required_dependency_ids.isEmpty())
-                    project.curseforge_required_dependency_ids.split(" ").each it::requiredDependency
-                // Optional dependencies
-                if (!project.curseforge_optional_dependency_ids.isEmpty())
-                    project.curseforge_optional_dependency_ids.split(" ").each it::optionalDependency
-            }
-        }
-
-        mainArtifact(file('build/renamedLibs/_' + jar.getArchiveFileName().get())) {
-            displayName = "${project.mod_name} ${project.mod_version} for Forge ${project.minecraft_suffix.substring(2)}"
-        }
-    }
-    options {
-        // Don't add project Java version
-        javaVersionAutoDetect = false
-    }
-}
-
-// Move CurseGradle's tasks from 'upload' to 'publishing'
-project.gradle.taskGraph.whenReady {
-    tasks.stream().filter(task -> task.group.equals "upload").each { task -> task.group = "publishing" }
-}
-
-// Minotaur settings for uploading to Modrinth
-modrinth {
-    // Get the Modrinth token from the environment variables
-    token = System.getenv("MODRINTH_TOKEN")
-    // Copy settings from gradle.properties
-    projectId = project.modrinth_project_id
-    versionNumber = version
-    versionType = project.modrinth_release_type // Can be either 'release', 'alpha', or 'beta'
-    versionName = "${project.mod_name} ${project.mod_version}"
-    gameVersions = project.modrinth_game_versions.split(" ") as List
-    // Convert the changelog file to text
-    changelog = file("changelog.md").text
-    uploadFile = file('build/renamedLibs/_' + jar.getArchiveFileName().get())
-    // With Loom, this MUST be set to `remapJar` instead of `jar`!
-    loaders = ["forge", "neoforge"]
-    if (!project.modrinth_required_dependency_ids.isEmpty() || !project.modrinth_optional_dependency_ids.isEmpty()) {
-        dependencies {
-            // Required dependencies
-            if (!project.modrinth_required_dependency_ids.isEmpty())
-                project.modrinth_required_dependency_ids.split(" ").each required::project
-            // Optional dependencies
-            if (!project.modrinth_optional_dependency_ids.isEmpty())
-                project.modrinth_optional_dependency_ids.split(" ").each optional::project
-        }
-    }
-}
-
 // Create task which copies from 'jar', but renames the file
 tasks.register('renameJar', Copy) {
     dependsOn build
@@ -284,11 +211,3 @@ tasks.register('renameJar', Copy) {
     rename "_"::concat
 }
 jar.finalizedBy renameJar
-
-// Create a task to upload to both CurseForge and Modrinth
-task publishAll {
-    group "publishing"
-    dependsOn("curseforge", "modrinth")
-    // Also build the file so I have a copy locally
-    dependsOn "build"
-}

changelog.md

@@ -1,3 +1,12 @@
+### SuperMartijn642's Core Library 1.1.17
+- Added support for custom tag entry types
+- Added a namespace tag entry type
+- Added workaround for side `BUKKIT` related errors
+- Updated tag loading behaviour to match newer Minecraft versions
+
+### SuperMartijn642's Core Library 1.1.16a
+- Fixed crash with Tool Progression
+
 ### SuperMartijn642's Core Library 1.1.16
 - Allow `ClientRegistrationHandler#registerAtlasSprite` to accept a different namespace
 

gradle.properties

@@ -27,7 +27,7 @@ coremod_class=CoreModPlugin
 mod_name=SuperMartijn642's Core Lib
 mod_description=SuperMartijn642's Core Lib adds lots of basic implementations for guis that allow for similar code between Minecraft 1.12, 1.14, 1.15, and 1.16!
 mod_id=supermartijn642corelib
-mod_version=1.1.16
+mod_version=1.1.17
 mod_license=All rights reserved
 mod_page=https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-core-lib
 mod_sources=https://github.com/SuperMartijn642/SuperMartijn642sCoreLib

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/supermartijn642/core/CoreLib.java

@@ -2,6 +2,7 @@
 
 import com.supermartijn642.core.data.TagLoader;
 import com.supermartijn642.core.data.condition.*;
+import com.supermartijn642.core.data.tag.entries.NamespaceTagEntry;
 import com.supermartijn642.core.generator.GeneratorManager;
 import com.supermartijn642.core.generator.standard.CoreLibMiningTagGenerator;
 import com.supermartijn642.core.loot_table.SurvivesExplosionLootCondition;
@@ -43,6 +44,9 @@ public CoreLib(){
         handler.registerResourceConditionSerializer("and", AndResourceCondition.SERIALIZER);
         handler.registerResourceConditionSerializer("ore_dict_populated", OreDictPopulatedResourceCondition.SERIALIZER);
 
+        // Register custom tag entry types
+        handler.registerCustomTagEntrySerializer("namespace", NamespaceTagEntry.SERIALIZER);
+
         // Register loot condition
         LootConditionManager.registerCondition(SurvivesExplosionLootCondition.SERIALIZER);
         LootConditionManager.registerCondition(ToolMatchLootCondition.SERIALIZER);

src/main/java/com/supermartijn642/core/block/BaseBlock.java

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 import java.util.function.Consumer;
 
 /**
@@ -273,7 +274,8 @@ public int getHarvestLevel(IBlockState state){
     }
 
     private boolean is(ResourceLocation tag){
-        return TagLoader.getTag(Registries.BLOCKS, tag).contains(Registries.BLOCKS.getIdentifier(this));
+        Set<ResourceLocation> blocks = TagLoader.getTag(Registries.BLOCKS, tag);
+        return blocks != null && blocks.contains(Registries.BLOCKS.getIdentifier(this));
     }
 
     @Override