Skip to content

Commit

Permalink
Well the fabric work
Browse files Browse the repository at this point in the history
  • Loading branch information
StewStrong committed Sep 27, 2024
1 parent 52443a1 commit 6be3966
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 154 deletions.
3 changes: 1 addition & 2 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ dependencies {
//implementation("io.github.fabricators_of_create.Porting-Lib:Porting-Lib:$port_lib_version+$minecraft_version")

modCompileOnly("maven.modrinth:create-big-cannons:${createbigcannons_version}")
modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")
modCompileOnly("com.rbasamoyai:createbigcannons-fabric-${minecraft_version}:${createbigcannons_version}")
// modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${port_lib_version}+${minecraft_version}")

//Bluemap fabric 1.19
modCompileOnly("curse.maven:bluemap-406463:4474497")
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.valkyrienskies.mod.common.command
import com.mojang.brigadier.CommandDispatcher
import com.mojang.brigadier.arguments.ArgumentType
import com.mojang.brigadier.arguments.BoolArgumentType
import com.mojang.brigadier.arguments.DoubleArgumentType
import com.mojang.brigadier.arguments.StringArgumentType
import com.mojang.brigadier.builder.LiteralArgumentBuilder
import com.mojang.brigadier.builder.RequiredArgumentBuilder
Expand All @@ -14,7 +13,6 @@ import net.minecraft.commands.arguments.EntityArgument
import net.minecraft.commands.arguments.coordinates.BlockPosArgument
import net.minecraft.commands.arguments.coordinates.Vec3Argument
import net.minecraft.network.chat.Component
import net.minecraft.network.chat.Component.translatable
import net.minecraft.world.entity.Entity
import net.minecraft.world.phys.BlockHitResult
import org.joml.Vector3d
Expand All @@ -23,12 +21,9 @@ import org.valkyrienskies.core.api.world.ServerShipWorld
import org.valkyrienskies.core.api.world.ShipWorld
import org.valkyrienskies.core.apigame.ShipTeleportData
import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl
import org.valkyrienskies.core.impl.game.ships.ShipData
import org.valkyrienskies.core.impl.game.ships.ShipObject
import org.valkyrienskies.core.util.x
import org.valkyrienskies.core.util.y
import org.valkyrienskies.core.util.z
import org.valkyrienskies.mod.common.dimensionId
import org.valkyrienskies.mod.common.getShipManagingPos
import org.valkyrienskies.mod.common.util.toJOML
import org.valkyrienskies.mod.common.util.toJOMLD
Expand Down Expand Up @@ -77,14 +72,7 @@ object VSCommands {
val r = ShipArgument.getShips(it, "ships").toList() as List<ServerShip>
val isStatic = BoolArgumentType.getBool(it, "is-static")
r.forEach { ship ->
if (ship is ShipObject) {
// TODO: AAAAAAAAA THIS IS HORRIBLE how can the API support this?
(ship.shipData as ShipData).isStatic = isStatic
} else if (ship is ShipData) {
// TODO: AAAAAAAAA THIS IS HORRIBLE how can the API support this?
ship.isStatic = isStatic
}

ship.isStatic = isStatic
}
it.source.sendVSMessage(
Component.translatable(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
package org.valkyrienskies.mod.compat

import net.minecraft.server.level.ServerLevel
/*
import org.joml.Vector3d
import org.valkyrienskies.core.api.ships.getAttachment
import org.valkyrienskies.mod.common.config.VSGameConfig
import org.valkyrienskies.mod.common.shipObjectWorld
import org.valkyrienskies.mod.common.util.GameTickForceApplier
import org.valkyrienskies.mod.common.util.toMinecraft
import weather2.ServerTickHandler
import weather2.weathersystem.storm.StormObject
import weather2.weathersystem.storm.StormObject=
*/

object Weather2Compat {
// Weather mod is not on 1.19.2, so it must be disabled!
fun tick(level: ServerLevel) {
/*
val mgr = ServerTickHandler
.getWeatherManagerFor(level.dimension())
Expand Down Expand Up @@ -69,5 +73,6 @@ object Weather2Compat {
}
}
}
*/
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
"mod_compat.create.client.MixinSchematicTransformation",
"mod_compat.create.client.MixinValueBox",
"mod_compat.create.client.trackOutlines.MixinBigOutlines",
"mod_compat.create.client.trackOutlines.MixinTrackBlockOutline",
"mod_compat.flywheel.InstancingEngineAccessor",
"mod_compat.flywheel.MixinBlockEntityInstanceManager",
"mod_compat.flywheel.MixinInstanceManager",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.client.resources.sounds.AbstractSoundInstance;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.RandomSource;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import org.joml.Vector3d;
Expand All @@ -23,8 +24,8 @@ public abstract class MixinSpeakerSound extends AbstractSoundInstance implements
@Unique private SpeakerPosition speakerPosition;
@Unique private Ship ship;

protected MixinSpeakerSound(ResourceLocation arg, SoundSource arg2) {
super(arg, arg2);
protected MixinSpeakerSound(ResourceLocation arg, SoundSource arg2, RandomSource arg3) {
super(arg, arg2, arg3);
}

@Inject(
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ create_fabric_version=0.5.1-c-build.1160+mc1.19.2
flywheel_version_fabric=0.6.9-6

# https://modrinth.com/mod/create-big-cannons/version/
createbigcannons_version= 0.5.2.a
createbigcannons_version=0.5.2.a

vs_core_version=1.1.0+cf7b0d3c5b
# Prevent kotlin from autoincluding stdlib as a dependency, which breaks
Expand Down

0 comments on commit 6be3966

Please sign in to comment.