Updated create to 0.5.1

ValkyrienSkies · Oct 16, 2023 · 33e03c5 · 33e03c5
1 parent 2139deb
commit 33e03c5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     //We just use a version from a platform and hope the classes exist on both versions and mixins apply correctly
     modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
         { exclude group: 'com.github.AlphaMode', module: 'fakeconfigtoml' }
-    modCompileOnly("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:0.6.8-33")
+    modCompileOnly("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version_fabric}")
     modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
 }
 

diff --git a/...ienskies/mod/mixin/mod_compat/create_big_cannons/MixinPitchOrientedContraptionEntity.java b/...ienskies/mod/mixin/mod_compat/create_big_cannons/MixinPitchOrientedContraptionEntity.java
@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.mixin.mod_compat.create_big_cannons;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
@@ -18,7 +18,6 @@
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
 
-
 @Pseudo
 @Mixin(targets = "rbasamoyai.createbigcannons.cannon_control.contraption.PitchOrientedContraptionEntity")
 public abstract class MixinPitchOrientedContraptionEntity extends OrientedContraptionEntity {

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -64,8 +64,10 @@ dependencies {
     modImplementation("curse.maven:cc-restitched-462672:3838648")
 
     // Create compat
-    modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}+${minecraft_version}") { transitive = false }
-    modImplementation("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version}")
+    modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}") {
+        exclude group: 'com.github.AlphaMode', module: 'fakeconfigtoml'
+    }
+    modImplementation("com.jozufozu.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version_fabric}")
     modImplementation("com.tterrag.registrate_fabric:Registrate:${registrate_version}")
     modImplementation("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
     modImplementation("me.alphamode:ForgeTags:${forge_tags_version}")

diff --git a/fabric/gradle.properties b/fabric/gradle.properties
@@ -1,11 +1,10 @@
 loader_platform=Fabric
-create_version=0.5.0g-821
+create_version=0.5.1-c-build.1092+mc1.18.2
 # https://github.com/Fabricators-of-Create/Create/blob/mc1.18/fabric/dev/gradle.properties
 config_api_id=3671141
 forge_config_api_port_version=3.2.4
 fake_player_api_version=0.3.0
 # https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel-Fabric
-flywheel_version=0.6.8-33
 reach_entity_attributes_version=2.1.1
 registrate_version=MC1.18.2-1.1.6
 forge_tags_version=2.1

diff --git a/...ava/org/valkyrienskies/mod/fabric/mixin/compat/create/MixinAbstractContraptionEntity.java b/...ava/org/valkyrienskies/mod/fabric/mixin/compat/create/MixinAbstractContraptionEntity.java
@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.fabric.mixin.compat.create;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
@@ -42,7 +42,7 @@ public void setWingGroupId(final int wingGroupId) {
     private void postTick(final CallbackInfo ci) {
         final AbstractContraptionEntity thisAsAbstractContraptionEntity = AbstractContraptionEntity.class.cast(this);
         final Level level = thisAsAbstractContraptionEntity.level;
-        if (wingGroupId != -1 && level instanceof ServerLevel serverLevel) {
+        if (wingGroupId != -1 && level instanceof final ServerLevel serverLevel) {
             final LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos(serverLevel,
                 VectorConversionsMCKt.toJOML(thisAsAbstractContraptionEntity.position()));
             if (ship != null) {

diff --git a/...ain/kotlin/org/valkyrienskies/mod/fabric/common/ContraptionShipyardEntityHandlerFabric.kt b/...ain/kotlin/org/valkyrienskies/mod/fabric/common/ContraptionShipyardEntityHandlerFabric.kt
@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.fabric.common
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity
 import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate

diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -2,6 +2,6 @@ loader_platform=Forge
 loom.platform=forge
 kotlin.stdlib.default.dependency=false
 #Compat
-create_version=0.5.0.g-233
-flywheel_version=0.6.8-98
+create_version=0.5.1.e-318
+flywheel_version=0.6.10-105
 registrate_version=MC1.18.2-1.1.3
diff --git a/...java/org/valkyrienskies/mod/forge/mixin/compat/create/MixinAbstractContraptionEntity.java b/...java/org/valkyrienskies/mod/forge/mixin/compat/create/MixinAbstractContraptionEntity.java
@@ -1,6 +1,6 @@
 package org.valkyrienskies.mod.forge.mixin.compat.create;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
@@ -40,7 +40,7 @@ public void setWingGroupId(final int wingGroupId) {
     private void postTick(final CallbackInfo ci) {
         final AbstractContraptionEntity thisAsAbstractContraptionEntity = AbstractContraptionEntity.class.cast(this);
         final Level level = thisAsAbstractContraptionEntity.level;
-        if (wingGroupId != -1 && level instanceof ServerLevel serverLevel) {
+        if (wingGroupId != -1 && level instanceof final ServerLevel serverLevel) {
             final LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos(serverLevel,
                 VectorConversionsMCKt.toJOML(thisAsAbstractContraptionEntity.position()));
             ship.getAttachment(WingManager.class).setWingGroupTransform(wingGroupId, computeContraptionWingTransform());

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,8 @@ architectury_version=4.10.86
 fabric_loader_version=0.14.10
 fabric_api_version=0.59.0+1.18.2
 forge_version=1.18.2-40.1.69
-create_fabric_version=0.5.0.i-934+1.18.2
+create_fabric_version=0.5.1-c-build.1092+mc1.18.2
+flywheel_version_fabric=0.6.9-38
 vs_core_version=1.1.0+00bb578f02
 # Prevent kotlin from autoincluding stdlib as a dependency, which breaks
 # gradle's composite builds (includeBuild) for some reason. We'll add it manually