diff --git a/build.gradle.kts b/build.gradle.kts index 2491f47..2ec0bb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,14 +14,13 @@ val trinkets_version: String by extra val cca_version: String by extra plugins { - id("com.possible-triangle.gradle") version ("0.1.4") + id("com.possible-triangle.gradle") version ("0.1.5") } withKotlin() fabric { dataGen() - enableMixins() includesMod("com.possible-triangle:flightlib-fabric:${flightlib_version}") } @@ -30,7 +29,7 @@ base { } repositories { - apply(from = "https://raw.githubusercontent.com/PssbleTrngle/GradleHelper/main/repositories/create-fabric.build.kts") + apply(from = "https://raw.githubusercontent.com/PssbleTrngle/GradleHelper/4211a23d270fb542408dd363748fd52740953a82/repositories/create-fabric.build.kts") curseMaven() modrinthMaven() diff --git a/gradle.properties b/gradle.properties index 2afbab9..062de29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ maven_group=com.possible-triangle jei_version=15.2.0.27 emi_version=1.0.19+1.20.1 -create_version=0.5.1-d-build.1161+mc1.20.1 +create_version=0.5.1-f-build.1335+mc1.20.1 night_config_version=3.6.7 flightlib_version=2.1.0 kotlin_fabric_version=1.9.6+kotlin.1.8.22 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/kotlin/com/possible_triangle/create_jetpack/Content.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt index 0da165e..e3f3bd0 100644 --- a/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt +++ b/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt @@ -165,7 +165,7 @@ object Content { } tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag) transform { - it.tab(AllCreativeModeTabs.MAIN_TAB.key) { mod -> + it.tab(AllCreativeModeTabs.BASE_CREATIVE_TAB.key) { mod -> mod.accept(ItemStack(it.entry).apply { orCreateTag.putFloat("Air", BacktankUtil.maxAir(this).toFloat()) }) 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 a476f0a..89ab267 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.20.1", "java": ">=17", - "flightlib": ">=2.0.0", - "create": ">=0.5.1-d" + "flightlib": "*", + "create": ">=0.5.1-f" } }