Skip to content

Commit afa4e4c

Browse files
authored
Merge pull request #33 from jamesgreen26/1.20
Depend on VLib for ship placement, simplifying code and fixing compat with VLib
2 parents 314c2dd + 18724c6 commit afa4e4c

File tree

14 files changed

+18
-295
lines changed

14 files changed

+18
-295
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ dependencies {
4242
modImplementation "maven.modrinth:valkyrien-skies:1.20.1-fabric-2.3.0-beta.5"
4343
modImplementation "maven.modrinth:eureka:1.20.1-fabric-1.5.1-beta.3"
4444

45+
modImplementation "maven.modrinth:vlib:1.20.1-0.0.4-alpha+fabric"
46+
47+
modImplementation "maven.modrinth:architectury-api:9.2.14+fabric"
4548

4649
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
4750
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"

src/main/java/ace/actually/pirates/mixin/shipPlacement/ServerWorldMixin.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/java/ace/actually/pirates/mixin/shipPlacement/StructureTemplateManagerMixin.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/main/java/ace/actually/pirates/mixin/shipPlacement/StructureTemplateMixin.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/main/java/ace/actually/pirates/structures/CanRemoveTemplate.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/java/ace/actually/pirates/structures/ShipStructurePlacementHelper.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/main/resources/META-INF/mods.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ versionRange = "*"
4343
ordering = "NONE"
4444
side = "BOTH"
4545

46+
[[dependencies.pirates]]
47+
modId = "vlib"
48+
mandatory = true
49+
versionRange = "*"
50+
ordering = "NONE"
51+
side = "BOTH"
52+
4653
[[dependencies.pirates]]
4754
modId = "valkyrienskies"
4855
mandatory = true
Binary file not shown.

src/main/resources/data/pirates/worldgen/structure/flyingship.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/main/resources/data/pirates/worldgen/structure_set/flyingships.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)