Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stupid and dumb non-release to hotpatch a create incompat on blankiecon maybe

Browse source
This commit is contained in:
gamma-delta 2022-05-30 22:43:17 -05:00
parent 00e9340851
commit d7f85ae37e
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Fabric/src/main/java/at/petrak/hexcasting/fabric/mixin/FabricIngredientMixin.java
View file

@ -9,19 +9,21 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Ingredient.class)
@Mixin(value = Ingredient.class, priority = 4000)
public class FabricIngredientMixin {
@Inject(method = "fromJson", at = @At("HEAD"), cancellable = true)
private static void fromJson(JsonElement jsonElement, CallbackInfoReturnable<Ingredient> cir) {
Ingredient overridden = FabricUnsealedIngredient.fromJson(jsonElement);
if (overridden != null)
if (overridden != null) {
cir.setReturnValue(overridden);
}
}
@Inject(method = "fromNetwork", at = @At("HEAD"), cancellable = true)
private static void fromNetwork(FriendlyByteBuf friendlyByteBuf, CallbackInfoReturnable<Ingredient> cir) {
Ingredient overridden = FabricUnsealedIngredient.fromNetwork(friendlyByteBuf);
if (overridden != null)
if (overridden != null) {
cir.setReturnValue(overridden);
}
}
}

4
Forge/build.gradle
View file

@ -131,7 +131,7 @@ dependencies {
compileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
runtimeOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion:api")
compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion:$jeiVersion:api")
@ -139,7 +139,7 @@ dependencies {
// aughh
testCompileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
testCompileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion:api")
testCompileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
}
mixin {

2
gradle.properties
View file

@ -10,7 +10,7 @@ minecraftVersion=1.18.2
modVersion=0.9.0
paucalVersion=0.4.4
patchouliVersion=67
patchouliVersion=69
jeiVersion=9.5.3.143
kotlinVersion=1.6.21