diff --git a/build.gradle b/build.gradle index e8037ba..97463f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'babric-loom' version '1.1.+' + id 'babric-loom' version '1.4.+' id 'java' } @@ -96,8 +96,6 @@ dependencies { modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar modImplementation "fabric-loader:fabric-loader:${project.loader_version}" - include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:0.2.0-beta.9"))) - implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" diff --git a/gradle.properties b/gradle.properties index ac748bc..ec898a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ bta_version=7.1-pre2a loader_version=0.15.6-babric.4-bta # Mod -mod_version=3.4.15 +mod_version=3.4.16 mod_group=turniplabs mod_name=halplibe diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..db9a6b8 100644 --- 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-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/turniplabs/halplibe/helper/recipeBuilders/RecipeBuilderShaped.java b/src/main/java/turniplabs/halplibe/helper/recipeBuilders/RecipeBuilderShaped.java index 0042b67..dc891a0 100644 --- a/src/main/java/turniplabs/halplibe/helper/recipeBuilders/RecipeBuilderShaped.java +++ b/src/main/java/turniplabs/halplibe/helper/recipeBuilders/RecipeBuilderShaped.java @@ -8,6 +8,7 @@ import net.minecraft.core.item.IItemConvertible; import net.minecraft.core.item.ItemStack; import turniplabs.halplibe.helper.RecipeBuilder; +import turniplabs.halplibe.mixin.accessors.RecipeSymbolAccessor; import java.util.Arrays; import java.util.HashMap; @@ -114,7 +115,14 @@ public void create(String recipeID, ItemStack outputStack) { if (tempplate == null){ recipe[x + y * width] = null; } else { - recipe[x + y * width] = new RecipeSymbol(cha == null ? ' ' : cha, tempplate.getStack(), tempplate.getItemGroup()); + if(tempplate.getItemGroup() == null){ + RecipeSymbol s = new RecipeSymbol(tempplate.getStack()); + ((RecipeSymbolAccessor)s).setSymbol(cha == null ? ' ' : cha); + recipe[x + y * width] = s; + } else { + recipe[x + y * width] = new RecipeSymbol(cha == null ? ' ' : cha, tempplate.getStack(), tempplate.getItemGroup()); + } + } } diff --git a/src/main/java/turniplabs/halplibe/mixin/accessors/RecipeSymbolAccessor.java b/src/main/java/turniplabs/halplibe/mixin/accessors/RecipeSymbolAccessor.java new file mode 100644 index 0000000..c413532 --- /dev/null +++ b/src/main/java/turniplabs/halplibe/mixin/accessors/RecipeSymbolAccessor.java @@ -0,0 +1,11 @@ +package turniplabs.halplibe.mixin.accessors; + +import net.minecraft.core.data.registry.recipe.RecipeSymbol; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(RecipeSymbol.class) +public interface RecipeSymbolAccessor { + @Accessor + void setSymbol(char symbol); +} diff --git a/src/main/resources/halplibe.mixins.json b/src/main/resources/halplibe.mixins.json index 9fea6be..1b218b9 100644 --- a/src/main/resources/halplibe.mixins.json +++ b/src/main/resources/halplibe.mixins.json @@ -9,6 +9,7 @@ "accessors.EntityFXAccessor", "accessors.EntityListAccessor", "accessors.LanguageAccessor", + "accessors.RecipeSymbolAccessor", "accessors.TileEntityAccessor", "accessors.WeightedRandomBagAccessor", "accessors.WeightedRandomBagEntryAccessor",