From 097b9192d272556fe20d7aa30d8c9bf842782954 Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Fri, 15 Mar 2024 13:41:53 +0100 Subject: [PATCH] update to create 0.5.1.f --- build.gradle.kts | 1 - gradle.properties | 2 +- .../mixin/NetheriteDivingHandlerMixin.java | 34 ------------------- src/main/resources/create_jetpack.mixins.json | 11 ------ src/main/resources/fabric.mod.json | 7 ++-- 5 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java delete mode 100644 src/main/resources/create_jetpack.mixins.json diff --git a/build.gradle.kts b/build.gradle.kts index 2491f47..b34c516 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,6 @@ withKotlin() fabric { dataGen() - enableMixins() includesMod("com.possible-triangle:flightlib-fabric:${flightlib_version}") } diff --git a/gradle.properties b/gradle.properties index 93b2e3e..18783a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ maven_group=com.possible-triangle jei_version=11.6.0.1015 emi_version=1.0.2+1.19.2 -create_version=0.5.1-c-build.1160+mc1.19.2 +create_version=0.5.1-f-build.1334+mc1.19.2 night_config_version=3.6.3 flightlib_version=1.2.0 kotlin_fabric_version=1.9.1+kotlin.1.8.10 diff --git a/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java b/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java deleted file mode 100644 index 1f90a0f..0000000 --- a/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.possible_triangle.create_jetpack.mixin; - -import com.simibubi.create.content.equipment.armor.NetheriteDivingHandler; -import com.tterrag.registrate.util.entry.ItemEntry; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterials; -import net.minecraft.world.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.Slice; - -@Mixin(NetheriteDivingHandler.class) -public class NetheriteDivingHandlerMixin { - - @Redirect( - method = "onLivingEquipmentChange(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V", - at = @At( - value = "INVOKE", - target = "Lcom/tterrag/registrate/util/entry/ItemEntry;isIn(Lnet/minecraft/world/item/ItemStack;)Z" - ), - slice = @Slice( - from = @At( - value = "FIELD", - target = "Lnet/minecraft/world/entity/EquipmentSlot;CHEST:Lnet/minecraft/world/entity/EquipmentSlot;" - ), - to = @At("TAIL") - ) - ) - private static boolean modifyNetheritePredicate(ItemEntry instance, ItemStack stack) { - return stack.getItem() instanceof ArmorItem armor && armor.getMaterial() == ArmorMaterials.NETHERITE; - } - -} diff --git a/src/main/resources/create_jetpack.mixins.json b/src/main/resources/create_jetpack.mixins.json deleted file mode 100644 index 85d451d..0000000 --- a/src/main/resources/create_jetpack.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "com.possible_triangle.create_jetpack.mixin", - "compatibilityLevel": "JAVA_17", - "refmap": "${mod_id}.refmap.json", - "mixins": ["NetheriteDivingHandlerMixin"], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fb6cc8b..d141371 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,15 +24,12 @@ "com.possible_triangle.create_jetpack.CreateJetpackMod" ] }, - "mixins": [ - "${mod_id}.mixins.json" - ], "depends": { "fabricloader": ">=0.14", "fabric": "*", "minecraft": "1.19.2", "java": ">=17", - "flightlib": ">=1.0.4", - "create": ">=0.5.1-c" + "flightlib": "*", + "create": ">=0.5.1-f" } }