Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to create -f release #7

Open
wants to merge 2 commits into
base: 1.20.x
Choose a base branch
from
Open

Port to create -f release #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0332c2b
Port to create -f release
solonovamax Mar 14, 2024
a61b2c4
Fix broken mixin
solonovamax Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -60,6 +62,8 @@ repositories {
includeGroup("dev.onyxstudios.cardinal-components-api")
}
}

maven("https://mvn.devos.one/releases/")
}

dependencies {
Expand Down Expand Up @@ -95,4 +99,4 @@ uploadToModrinth {
dependencies {
required("Xbc0uyRg")
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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(
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
})
Expand Down Expand Up @@ -220,4 +220,4 @@ object Content {
REGISTRATE.setupDatagen(generator.createPack(), helper)
}

}
}
Loading