Skip to content

Commit bf461bd

Browse files
StewStrongStewStrong
committed
Merged changes from 1.18.x/main, updated VS2 to latest
2 parents a19337e + af8279f commit bf461bd

File tree

73 files changed

+1002
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1002
-412
lines changed

‎build.gradle

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
// Needed for Forge+Fabric
3-
id "architectury-plugin" version "3.4.143"
4-
id "dev.architectury.loom" version "1.0.306" apply false
3+
id "architectury-plugin" version "3.4.146"
4+
id "dev.architectury.loom" version "1.3.355" apply false
55
// Kotlin
6-
id "org.jetbrains.kotlin.jvm" version "1.7.21" apply false
6+
id "org.jetbrains.kotlin.jvm" version "1.9.10" apply false
77
// Kotlin linter
88
id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
99
// Java linter
@@ -49,6 +49,9 @@ subprojects {
4949
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
5050
// The following line declares the mojmap mappings, you may use other mappings as well
5151
mappings loom.officialMojangMappings()
52+
53+
implementation("org.joml:joml:1.10.4") { transitive = false }
54+
implementation("org.joml:joml-primitives:1.10.0") { transitive = false }
5255
}
5356

5457
checkstyle {
@@ -65,9 +68,9 @@ subprojects {
6568
tasks.withType(Checkstyle) {
6669
reports {
6770
// Do not output html reports
68-
html.enabled = false
71+
html.required = false
6972
// Output xml reports
70-
xml.enabled = true
73+
xml.required = true
7174
}
7275
}
7376

‎changelogs/1.1.0-beta.10.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Blacklist changes
2+
* added `minecraft:tall_seagrass`
3+
* added `minecraft:oak_sapling`
4+
* added `minecraft:spruce_sapling`
5+
* added `minecraft:birch_sapling`
6+
* added `minecraft:jungle_sapling`
7+
* added `minecraft:acacia_sapling`
8+
* added `minecraft:dark_oak_sapling`
9+
* added `minecraft:oak_leaves`
10+
* added `minecraft:spruce_leaves`
11+
* added `minecraft:birch_leaves`
12+
* added `minecraft:jungle_leaves`
13+
* added `minecraft:acacia_leaves`
14+
* added `minecraft:dark_oak_leaves`
15+
# Config Changes
16+
* `engineTurnPower`
17+
* `engineHeatChangeExponent`
18+
* `engineFuelSaving`
19+
* `engineMinCapacity`
20+
# Changes
21+
* Updated balloon crafting recipes
22+
* Having extra balloons now increases elevation speed
23+
* Updated mass info for engine and anchor
24+
* Added a more intense animation for when the engine is fully heated
25+
* Made engines affect turn speed
26+
* Redstone will now stop fuel consumption on engines instead of pausing it
27+
# bugfixes
28+
* Fixed bug that caused engine heat to not work properly
29+
* Fixed engine not dropping inventory when broken
30+
* Fixed issues where the player became soft-locked when the helm was destroyed
31+
* Fixed engine not returning bucket

‎changelogs/1.1.1-beta.1.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Blacklist changes
2+
* added `minecraft:snow_block`
3+
# Config Changes
4+
* added `engineRedstoneBehaviorPause`
5+
* added `enginePowerAngularMin`
6+
* renamed `enginePower` to `enginePowerLinear`
7+
* renamed `minEnginePower` to `enginePowerLinearMin`
8+
* renamed `engineTurnPower` to `enginePowerAngular`
9+
* Updated Kotlin and VS2.

‎changelogs/1.4.0-beta.1.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Blacklist changes
2+
* added `minecraft:deepslate`
3+
* added `minecraft:tuff`
4+
# Recipe Changes
5+
* Grouped balloon color recipes.
6+
* Grouped helm recipes.
7+
* Grouped balloon recipes.
8+
* Added recipe unlock conditions.
9+
* Updated some recipes to use tags instead of specific items
10+
# Changes
11+
* Increased break time for balloons.

‎common/build.gradle

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@ loom {
77
}
88

99
dependencies {
10+
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixin_extras_version"))
11+
1012
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
1113
// Do NOT use other classes from fabric loader
1214
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
1315
// Remove the next line if you don't want to depend on the API
1416
// modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
15-
modApi("org.valkyrienskies:valkyrienskies-1192-common:${rootProject.vs2_version}")
16-
implementation("org.valkyrienskies.core:api:1.1.0+ead972f384") { transitive = false }
17+
modApi("org.valkyrienskies:valkyrienskies-119-common:${rootProject.vs2_version}")
18+
19+
compileOnly("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
20+
compileOnly("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")
21+
compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
22+
compileOnly("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")
1723

18-
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21"
19-
api "org.jetbrains.kotlin:kotlin-reflect:1.7.21"
24+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
25+
api "org.jetbrains.kotlin:kotlin-reflect:1.9.10"
2026
}
2127

2228
publishing {

‎common/src/main/java/org/valkyrienskies/eureka/mixin/client/PlayerEntityModelMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
@Mixin(PlayerModel.class)
1515
public abstract class PlayerEntityModelMixin<T extends LivingEntity> extends HumanoidModel<T> {
1616

17-
public PlayerEntityModelMixin(ModelPart $$0) {
18-
super($$0);
17+
public PlayerEntityModelMixin(final ModelPart model) {
18+
super(model);
1919
}
2020

2121
@SuppressWarnings("unchecked")

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlocks.kt

+17-18
Original file line numberDiff line numberDiff line change
@@ -77,87 +77,87 @@ object EurekaBlocks {
7777
// region Balloons
7878
val BALLOON = BLOCKS.register("balloon") {
7979
BalloonBlock(
80-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.WOOL).sound(SoundType.WOOL)
80+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
8181
)
8282
}
8383
val WHITE_BALLOON = BLOCKS.register("white_balloon") {
8484
BalloonBlock(
85-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).sound(SoundType.WOOL)
85+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
8686
)
8787
}
8888
val LIGHT_GRAY_BALLOON = BLOCKS.register("light_gray_balloon") {
8989
BalloonBlock(
90-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).sound(SoundType.WOOL)
90+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
9191
)
9292
}
9393
val GRAY_BALLOON = BLOCKS.register("gray_balloon") {
9494
BalloonBlock(
95-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).sound(SoundType.WOOL)
95+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
9696
)
9797
}
9898
val BLACK_BALLOON = BLOCKS.register("black_balloon") {
9999
BalloonBlock(
100-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).sound(SoundType.WOOL)
100+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
101101
)
102102
}
103103
val RED_BALLOON = BLOCKS.register("red_balloon") {
104104
BalloonBlock(
105-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).sound(SoundType.WOOL)
105+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
106106
)
107107
}
108108
val ORANGE_BALLOON = BLOCKS.register("orange_balloon") {
109109
BalloonBlock(
110-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).sound(SoundType.WOOL)
110+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
111111
)
112112
}
113113
val YELLOW_BALLOON = BLOCKS.register("yellow_balloon") {
114114
BalloonBlock(
115-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).sound(SoundType.WOOL)
115+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
116116
)
117117
}
118118
val LIME_BALLOON = BLOCKS.register("lime_balloon") {
119119
BalloonBlock(
120-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).sound(SoundType.WOOL)
120+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
121121
)
122122
}
123123
val GREEN_BALLOON = BLOCKS.register("green_balloon") {
124124
BalloonBlock(
125-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).sound(SoundType.WOOL)
125+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
126126
)
127127
}
128128
val LIGHT_BLUE_BALLOON = BLOCKS.register("light_blue_balloon") {
129129
BalloonBlock(
130-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).sound(SoundType.WOOL)
130+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
131131
)
132132
}
133133
val CYAN_BALLOON = BLOCKS.register("cyan_balloon") {
134134
BalloonBlock(
135-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).sound(SoundType.WOOL)
135+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
136136
)
137137
}
138138
val BLUE_BALLOON = BLOCKS.register("blue_balloon") {
139139
BalloonBlock(
140-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).sound(SoundType.WOOL)
140+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
141141
)
142142
}
143143
val PURPLE_BALLOON = BLOCKS.register("purple_balloon") {
144144
BalloonBlock(
145-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).sound(SoundType.WOOL)
145+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
146146
)
147147
}
148148
val MAGENTA_BALLOON = BLOCKS.register("magenta_balloon") {
149149
BalloonBlock(
150-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).sound(SoundType.WOOL)
150+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
151151
)
152152
}
153153
val PINK_BALLOON = BLOCKS.register("pink_balloon") {
154154
BalloonBlock(
155-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).sound(SoundType.WOOL)
155+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
156156
)
157157
}
158158
val BROWN_BALLOON = BLOCKS.register("brown_balloon") {
159159
BalloonBlock(
160-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).sound(SoundType.WOOL)
160+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
161161
)
162162
}
163163
// endregion
@@ -212,5 +212,4 @@ object EurekaBlocks {
212212
items.register(it.name) { BlockItem(it.get(), Item.Properties().tab(EurekaItems.TAB)) }
213213
}
214214
}
215-
216215
}

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaConfig.kt

+19-21
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ object EurekaConfig {
1414
class Server {
1515

1616
@JsonSchema(description = "Movement power per engine when heated fully")
17-
val enginePower: Float = 2000000f
17+
val enginePowerLinear: Float = 2000000f
1818

1919
@JsonSchema(description = "Movement power per engine with minimal heat")
20-
val minEnginePower: Float = 10000f
20+
val enginePowerLinearMin: Float = 10000f
2121

2222
@JsonSchema(description = "Turning power per engine when heated fully")
23-
val engineTurnPower = 1f
23+
val enginePowerAngular = 1.0f
24+
25+
@JsonSchema(description = "Turning power per engine when minimal heat")
26+
val enginePowerAngularMin = 0.0f
2427

2528
@JsonSchema(description = "The amount of heat a engine loses per tick")
2629
val engineHeatLoss = 0.01f
@@ -31,6 +34,9 @@ object EurekaConfig {
3134
@JsonSchema(description = "Increases heat gained at low heat level, and increased heat decreases when at high heat and not consuming fuel")
3235
val engineHeatChangeExponent = 0.1f
3336

37+
@JsonSchema(description = "Pause fuel consumption and power when block is powered")
38+
val engineRedstoneBehaviorPause = false
39+
3440
@JsonSchema(description = "Avoids consuming fuel when heat is 100%")
3541
val engineFuelSaving = false
3642

@@ -72,7 +78,7 @@ object EurekaConfig {
7278
@JsonSchema(description = "Allow Eureka controlled ships to be affected by fluid drag")
7379
var doFluidDrag = false
7480

75-
// Do I need to explain? the mass 1 balloon gets to float
81+
// Do i need to explain? the mass 1 baloon gets to float
7682
@JsonSchema(description = "Amount of mass in kg a balloon can lift")
7783
var massPerBalloon = 5000.0
7884

@@ -83,10 +89,12 @@ object EurekaConfig {
8389
@JsonSchema(description = "The maximum linear acceleration at any point on the ship caused by helm torque")
8490
var turnAcceleration = 10.0
8591

86-
@JsonSchema(description = "The maximum distance from center of mass to one end of the ship considered by " +
92+
@JsonSchema(
93+
description = "The maximum distance from center of mass to one end of the ship considered by " +
8794
"the turn speed. At it's default of 16, it ensures that really large ships will turn at the same " +
8895
"speed as a ship with a center of mass only 16 blocks away from the farthest point in the ship. " +
89-
"That way, large ships do not turn painfully slowly")
96+
"That way, large ships do not turn painfully slowly"
97+
)
9098
var maxSizeForTurnSpeedPenalty = 16.0
9199

92100
// The strength used when trying to level the ship
@@ -127,6 +135,8 @@ object EurekaConfig {
127135
"minecraft:granite",
128136
"minecraft:diorite",
129137
"minecraft:andesite",
138+
"minecraft:deepslate",
139+
"minecraft:tuff",
130140
"minecraft:crimson_nylium",
131141
"minecraft:warped_nylium",
132142
"minecraft:red_sand",
@@ -169,6 +179,7 @@ object EurekaConfig {
169179
"minecraft:chorus_plant",
170180
"minecraft:chorus_flower",
171181
"minecraft:snow",
182+
"minecraft:snow_block",
172183
"minecraft:cactus",
173184
"minecraft:vine",
174185
"minecraft:sunflower",
@@ -193,25 +204,12 @@ object EurekaConfig {
193204
"minecraft:jungle_sapling",
194205
"minecraft:acacia_sapling",
195206
"minecraft:dark_oak_sapling",
196-
"minecraft:mangrove_propagule",
197-
"minecraft:cherry_sapling",
198207
"minecraft:oak_leaves",
199208
"minecraft:spruce_leaves",
200209
"minecraft:birch_leaves",
201210
"minecraft:jungle_leaves",
202211
"minecraft:acacia_leaves",
203-
"minecraft:dark_oak_leaves",
204-
"minecraft:mangrove_leaves",
205-
"minecraft:cherry_leaves",
206-
"minecraft:azalea_leaves",
207-
"minecraft:flowering_azalea_leaves",
208-
"minecraft:frog_spawn",
209-
"minecraft:mangrove_roots",
210-
"minecraft:mud",
211-
"minecraft:muddy_mangrove_roots",
212-
"minecraft:reinforced_deepslate",
213-
"minecraft:sculk",
214-
"minecraft:sculk_vein"
212+
"minecraft:dark_oak_leaves"
215213
)
216214

217215
@JsonSchema(description = "Whether the ship helm assembles diagonally connected blocks or not")
@@ -227,6 +225,6 @@ object EurekaConfig {
227225
val allowDisassembly = true
228226

229227
@JsonSchema(description = "Maximum number of blocks allowed in a ship. Set to 0 for no limit")
230-
val maxShipBlocks = 32*32*32
228+
val maxShipBlocks = 32 * 32 * 32
231229
}
232230
}

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaMod.kt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.valkyrienskies.eureka
22

33
import org.valkyrienskies.core.impl.config.VSConfigClass
44

5-
65
object EurekaMod {
76
const val MOD_ID = "vs_eureka"
87

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaWeights.kt

+17-6
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,31 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties
77
import org.valkyrienskies.core.apigame.world.chunks.BlockType
88
import org.valkyrienskies.mod.common.BlockStateInfo
99
import org.valkyrienskies.mod.common.BlockStateInfoProvider
10+
import org.valkyrienskies.physics_api.Lod1BlockStateId
11+
import org.valkyrienskies.physics_api.Lod1LiquidBlockStateId
12+
import org.valkyrienskies.physics_api.Lod1SolidBlockStateId
13+
import org.valkyrienskies.physics_api.voxel.Lod1LiquidBlockState
14+
import org.valkyrienskies.physics_api.voxel.Lod1SolidBlockState
1015

1116
object EurekaWeights : BlockStateInfoProvider {
17+
override val blockStateData: List<Triple<Lod1SolidBlockStateId, Lod1LiquidBlockStateId, Lod1BlockStateId>>
18+
get() = emptyList()
19+
override val liquidBlockStates: List<Lod1LiquidBlockState>
20+
get() = emptyList()
1221
override val priority: Int
1322
get() = 200
23+
override val solidBlockStates: List<Lod1SolidBlockState>
24+
get() = emptyList()
1425

1526
override fun getBlockStateMass(blockState: BlockState): Double? {
1627
if (blockState.block == EurekaBlocks.BALLAST.get()) {
1728
return EurekaConfig.SERVER.ballastWeight + (EurekaConfig.SERVER.ballastNoWeight - EurekaConfig.SERVER.ballastWeight) * (
18-
(
19-
blockState.getValue(
20-
BlockStateProperties.POWER
21-
) + 1
22-
) / 16.0
23-
)
29+
(
30+
blockState.getValue(
31+
BlockStateProperties.POWER
32+
) + 1
33+
) / 16.0
34+
)
2435
}
2536

2637
return null

0 commit comments

Comments
 (0)