Skip to content

Commit

Permalink
Remove TagProvider NPE fix
Browse files Browse the repository at this point in the history
This has now been fixed in forge.
  • Loading branch information
Su5eD committed Jul 14, 2023
1 parent d457422 commit 2631a98
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 40 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"compatibilityLevel": "JAVA_16",
"mixins": [
"loot.BlockLootTableGeneratorMixin",
"TagProviderMixin",
"ModelProviderMixin",
"DataGeneratorMixin"
],
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ fabric-client-tags-api-v1-version=1.1.0

# FFAPI Properties
loom.platform=forge
forge_version=1.20.1-47.1.0
forge_version=1.20.1-47.1.8
pack_format=15
forgified_version=1.3.0
9 changes: 7 additions & 2 deletions gradle/ffapi-setup.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ allprojects {
// sources to the source set.
sourceRoots.from(resourceRoots)
outputDir = file("src/generated/$sourceSetName/resources")
loaderVersionString = rootProject.forge_version.tokenize('-')[1].tokenize('.')[0]
def loaderVer = rootProject.forge_version.tokenize('-')[1]
loaderVersionString = loaderVer.tokenize('.')[0]
forgeVersionString = loaderVer
minecraftVersionString = rootProject.minecraft_version
packFormat = rootProject.pack_format.toInteger()
addMixinConfigs = sourceSet.name.startsWith("test")
Expand Down Expand Up @@ -302,6 +304,9 @@ abstract class GenerateForgeModMetadata extends DefaultTask {

@Input
final Property<String> loaderVersionString = project.objects.property(String)

@Input
final Property<String> forgeVersionString = project.objects.property(String)

@Input
final Property<String> minecraftVersionString = project.objects.property(String)
Expand Down Expand Up @@ -399,7 +404,7 @@ abstract class GenerateForgeModMetadata extends DefaultTask {
{
modId "forge"
mandatory true
versionRange "[${loaderVersionString.get()},)"
versionRange "[${forgeVersionString.get()},)"
ordering "NONE"
side "BOTH"
},
Expand Down

0 comments on commit 2631a98

Please sign in to comment.