diff --git a/build.gradle.kts b/build.gradle.kts index 2491f47..43145f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,8 @@ val trinkets_version: String by extra val cca_version: String by extra plugins { + // force newer loom version (version that comes with com.possible-triangle.gradle is too old) + id("fabric-loom") version "1.5.+" apply false id("com.possible-triangle.gradle") version ("0.1.4") } @@ -60,6 +62,8 @@ repositories { includeGroup("dev.onyxstudios.cardinal-components-api") } } + + maven("https://mvn.devos.one/releases/") } dependencies { @@ -95,4 +99,4 @@ uploadToModrinth { dependencies { required("Xbc0uyRg") } -} \ No newline at end of file +} 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..509c4a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 index 1f90a0f..057f7fd 100644 --- a/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java +++ b/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java @@ -1,7 +1,6 @@ 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; @@ -17,7 +16,7 @@ public class NetheriteDivingHandlerMixin { 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" + target = "Lcom/simibubi/create/content/equipment/armor/NetheriteDivingHandler;isNetheriteBacktank(Lnet/minecraft/world/item/ItemStack;)Z" ), slice = @Slice( from = @At( @@ -27,7 +26,7 @@ public class NetheriteDivingHandlerMixin { to = @At("TAIL") ) ) - private static boolean modifyNetheritePredicate(ItemEntry instance, ItemStack stack) { + private static boolean modifyNetheritePredicate(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..ea3da4d 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()) }) @@ -220,4 +220,4 @@ object Content { REGISTRATE.setupDatagen(generator.createPack(), helper) } -} \ No newline at end of file +}