Easier than I expected (#2)

ThreeTAG · Dec 25, 2024 · 1912e1a · 1912e1a
1 parent ba1ffa0
commit 1912e1a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -4,7 +4,7 @@ architectury {
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
-    modImplementation "maven.modrinth:tardis-refined:$rootProject.tardis_refined_version+fabric"
+    modImplementation "maven.modrinth:tardis-refined:fabric-$rootProject.tardis_refined_version"
 
     // Forge Config API Port
     modCompileOnlyApi "fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${rootProject.forge_config_api_port_version}"

diff --git a/common/src/main/java/net/threetag/triadtech/mixin/FlightDanceManagerMixin.java b/common/src/main/java/net/threetag/triadtech/mixin/FlightDanceManagerMixin.java
@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import whocraft.tardis_refined.common.capability.TardisLevelOperator;
+import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.tardis.manager.FlightDanceManager;
 
 @Mixin(FlightDanceManager.class)

diff --git a/common/src/main/java/net/threetag/triadtech/tweaks/KeyTardisCallTweak.java b/common/src/main/java/net/threetag/triadtech/tweaks/KeyTardisCallTweak.java
@@ -14,22 +14,23 @@
 import net.minecraft.world.level.Level;
 import net.threetag.triadtech.upgrade.TTUpgrades;
 import org.jetbrains.annotations.Nullable;
-import whocraft.tardis_refined.common.capability.TardisLevelOperator;
+import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.items.KeyItem;
 import whocraft.tardis_refined.common.tardis.TardisNavLocation;
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.util.DimensionUtil;
 import whocraft.tardis_refined.common.util.Platform;
 import whocraft.tardis_refined.common.util.PlayerUtil;
 import whocraft.tardis_refined.constants.ModMessages;
+import whocraft.tardis_refined.registry.TRBlockRegistry;
 
 import java.util.ArrayList;
 import java.util.Optional;
 
 public class KeyTardisCallTweak {
 
     public static InteractionResultHolder<ItemStack> rightClick(Player player, Level level, InteractionHand hand, @Nullable BlockPos pos) {
-        var stack = player.getItemInHand(hand);
+        ItemStack stack = player.getItemInHand(hand);
 
         if (!stack.isEmpty() && stack.getItem() instanceof KeyItem && level instanceof ServerLevel serverLevel) {
             ArrayList<ResourceKey<Level>> keyChain = KeyItem.getKeychain(stack);
@@ -42,14 +43,14 @@ public static InteractionResultHolder<ItemStack> rightClick(Player player, Level
                     ServerLevel tardisLevel = Platform.getServer().getLevel(dimension);
                     Optional<TardisLevelOperator> operatorOptional = TardisLevelOperator.get(tardisLevel);
 
-                    if (operatorOptional.isEmpty() || !operatorOptional.get().getUpgradeHandler().isUpgradeUnlocked(TTUpgrades.EMERGENCY_EXIT.get())) {
+                    if (level.getBlockState(pos).is(TRBlockRegistry.LANDING_PAD.get()) || operatorOptional.isEmpty() || !operatorOptional.get().getUpgradeHandler().isUpgradeUnlocked(TTUpgrades.EMERGENCY_EXIT.get())) {
                         return InteractionResultHolder.pass(stack);
                     }
 
                     TardisLevelOperator operator = operatorOptional.get();
                     TardisPilotingManager pilotManager = operator.getPilotingManager();
 
-                    if (pilotManager.beginFlight(true, null) && !pilotManager.isOnCooldown()) {
+                    if (pilotManager.beginFlight(true, null) && !pilotManager.isInRecovery()) {
                         pilotManager.setTargetLocation(new TardisNavLocation(pos.above(), player.getDirection().getOpposite(), serverLevel));
                         level.playSound(null, pos, SoundEvents.PLAYER_LEVELUP, SoundSource.BLOCKS, 1.0F, 1.0F);
                         PlayerUtil.sendMessage(player, Component.translatable(ModMessages.TARDIS_IS_ON_THE_WAY), true);

diff --git a/common/src/main/java/net/threetag/triadtech/upgrade/TTUpgrades.java b/common/src/main/java/net/threetag/triadtech/upgrade/TTUpgrades.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.world.item.Items;
 import net.threetag.triadtech.TriadTech;
-import whocraft.tardis_refined.common.capability.upgrades.Upgrade;
+import whocraft.tardis_refined.common.capability.tardis.upgrades.Upgrade;
 import whocraft.tardis_refined.registry.DeferredRegistry;
 import whocraft.tardis_refined.registry.RegistrySupplier;
 import whocraft.tardis_refined.registry.TRItemRegistry;

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -38,11 +38,12 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
     modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
-    modImplementation "maven.modrinth:tardis-refined:$rootProject.tardis_refined_version+fabric"
+    modImplementation "maven.modrinth:tardis-refined:fabric-$rootProject.tardis_refined_version"
 
     // Cardinal Components
     modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${rootProject.cardinal_components_version}"
     modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-world:${rootProject.cardinal_components_version}"
+    modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${rootProject.cardinal_components_version}"
 
     // Forge Config API Port
     modApi "fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${rootProject.forge_config_api_port_version}"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -48,7 +48,7 @@ configurations {
 
 dependencies {
     forge "net.minecraftforge:forge:$rootProject.forge_version"
-    modImplementation "maven.modrinth:tardis-refined:$rootProject.tardis_refined_version+forge"
+    modImplementation "maven.modrinth:tardis-refined:neoforge-$rootProject.tardis_refined_version"
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionForge')

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version=1.0.0
+mod_version=1.0.1
 maven_group=net.threetag.triadtech
 archives_name=triadtech
 enabled_platforms=fabric,forge
@@ -15,6 +15,6 @@ minecraft_version=1.20.1
 fabric_loader_version=0.15.11
 fabric_api_version=0.92.2+1.20.1
 forge_version=1.20.1-47.2.32
-tardis_refined_version=1.20.1-2.0.3
+tardis_refined_version=mc1.20.1-v2.1.0
 forge_config_api_port_version=8.0.0
 cardinal_components_version=5.2.2