Skip to content

Commit 21e7aeb

Browse files
authored
Merge pull request #719 from zyxkad/player-rotate-handle-feature
Player rotate handle feature
2 parents f5efd86 + d6dd79b commit 21e7aeb

131 files changed

Lines changed: 2590 additions & 1451 deletions

File tree

Some content is hidden

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

build.gradle

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ repositories {
201201
}
202202
}
203203
maven {
204-
name = "Modmaven Jei"
204+
name = "Modmaven"
205205
url = 'https://modmaven.dev/'
206206
content {
207-
includeGroup("mezz.jei")
208207
includeGroup("appeng")
209208
includeGroup("mekanism")
209+
includeGroup("mezz.jei")
210210
}
211211
}
212212
maven {
@@ -376,20 +376,15 @@ dependencies {
376376
// runtimeOnly fg.deobf("curse.maven:createaddition-439890:5099757")
377377

378378
// Valkyrien Skies 2
379-
implementation("org.joml:joml:1.10.4") {
380-
transitive = false
381-
}
382-
implementation("org.joml:joml-primitives:1.10.0") {
383-
transitive = false
384-
}
385-
// implementation fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
386-
implementation fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}") {
387-
transitive = false
388-
}
379+
compileOnly("org.joml:joml:1.10.4")
380+
compileOnly("org.joml:joml-primitives:1.10.0")
381+
// compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
382+
compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
389383
compileOnly "org.valkyrienskies.core:api:${vs_core_version}"
390384
compileOnly "org.valkyrienskies.core:api-game:${vs_core_version}"
391385
compileOnly "org.valkyrienskies.core:util:${vs_core_version}"
392386
compileOnly "org.valkyrienskies.core:impl:${vs_core_version}"
387+
runtimeOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
393388
runtimeOnly fg.deobf("curse.maven:valkyrien-skies-258371:${valkyrien_skies_version}")
394389
runtimeOnly fg.deobf("curse.maven:eureka-ships-654384:${eureka_ships_version}")
395390
runtimeOnly fg.deobf("curse.maven:clockwork-807792:${clockwork_version}")
@@ -427,12 +422,12 @@ task setupServer(type: Copy) {
427422
}
428423

429424
["Client", "Server"].forEach { name ->
430-
tasks.register("test$name", JavaExec.class).configure {
425+
tasks.register("test${name}", JavaExec.class).configure {
431426
it.group('In-game tests')
432427
it.description("Runs tests on a temporary Minecraft instance.")
433-
it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')
428+
it.dependsOn(setupServer, "prepareRunTest${name}", "cleanTest${name}", 'compileTestModJava')
434429

435-
JavaExec exec = tasks.getByName("runTest$name")
430+
JavaExec exec = tasks.getByName("runTest${name}")
436431
exec.copyTo(it)
437432
it.setClasspath(exec.getClasspath())
438433
it.mainClass = exec.mainClass

gradle.properties

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
org.gradle.jvmargs=-Xmx4G
21
org.gradle.daemon=false
2+
org.gradle.jvmargs=-Xmx4G
33
org.gradle.logging.level=info
44

55
# Minecraft related
@@ -10,53 +10,57 @@ mod_id=advancedperipherals
1010
mod_version=0.8r
1111
minecraft_version=1.19.2
1212
mod_artifact_suffix=
13+
1314
forge_version=43.4.0
1415
loader_version=43
16+
1517
release_type=release
18+
1619
mappings_channel=parchment
1720
mappings_version=2022.11.20-1.19.2
18-
jb_annotations=21.0.1
1921

2022
# Test dependencies
21-
junit_version=5.7.2
2223
hamcrest_version=2.2
24+
jb_annotations=21.0.1
25+
junit_version=5.7.2
2326
kotlin_version=1.8.0
2427
kotlinx_coroutines_version=1.7.3
2528
ttoolkit_version=0.1.3
2629

2730
# Mod dependencies
2831
cc_version=1.101.3
29-
curios_version=1.19.2-5.1.4.1
30-
minecolonies_version=1.19.2-1.1.473-BETA
31-
appliedenergistics_version=12.9.9
32-
patchouli_version=1.19.2-77
33-
refinedstorage_version=1.11.7
32+
33+
ae2additions_version=4646599
34+
ae2things_version=4367610
35+
appliedenergistics_version=12.9.12
36+
appliedmekanistics_version=4734608
3437
botania_version=1.19.2-440-FORGE
38+
clockwork_version=5171528
3539
create_version=0.5.1.f-46
3640
createca_version=5099757
41+
curios_version=1.19.2-5.1.4.1
42+
dimstorage_version=3927875
43+
eureka_ships_version=5321628
44+
kotlinforforge_version=3.12.0
3745
mekanism_version=1.19.2-10.3.9.13
38-
ae2things_version=4367610
46+
minecolonies_version=1.19.2-1.1.473-BETA
47+
patchouli_version=1.19.2-77
3948
powah_version=4183078
40-
ae2additions_version=4646599
41-
kotlinforforge_version=3.12.0
42-
appliedmekanistics_version=4734608
43-
dimstorage_version=3927875
49+
refinedstorage_version=1.11.7
4450
valkyrien_skies_version=4994898
45-
eureka_ships_version=5321628
46-
clockwork_version=5171528
4751
vs2_version=2.1.2-beta.1+a04911c932
4852
vs_core_version=1.1.0+2a62e6a823
4953

5054
# Mod dependencies which are needed for other mods
5155
# For minecolonies
52-
structurize_version=1.19.2-1.0.649-BETA
53-
multipiston_version=1.19.2-1.2.21-ALPHA
5456
blockui_version=1.19.2-0.0.102-ALPHA
5557
domumornamentum_version=1.19-1.0.141-BETA
58+
multipiston_version=1.19.2-1.2.21-ALPHA
59+
structurize_version=1.19.2-1.0.649-BETA
5660

5761
# For DimStorage
5862
edivadlib_version=3927847
5963

60-
# Mod dependencies for testing stuff(Only used in the dev environment)
64+
# Mod dependencies for testing stuff (Only used in the dev environment)
65+
jade_version=4914105
6166
jei_version=1.19.2-forge:11.6.0.1016
62-
jade_version=4914105
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
// 1.19.2 2024-05-28T14:53:16.653667 Tags for minecraft:item
1+
// 1.19.2 2025-03-15T16:18:50.46663 Tags for minecraft:item
2+
de4b4f45ec18b2b1f0db1c36882981042e20ee23 data/advancedperipherals/tags/items/p2p_attunements/cable_p2p_tunnel.json
23
72eba3b11f69e16c87488f7c4ba7cfdad42c378e data/advancedperipherals/tags/items/smart_glasses.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2024-05-28T14:53:16.655175 AP POI Type Tags
1+
// 1.19.2 2025-03-15T16:18:50.465796 AP POI Type Tags
22
d3d6b837660a4e213f287ad9d11e12368b90cd8e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.655476 Turtle Upgrades
1+
// 1.19.2 2025-03-15T16:18:50.466321 Turtle Upgrades
22
b8f19ae0fb5bb898facc08e3787e0f96c8211881 data/advancedperipherals/computercraft/turtle_upgrades/chatty_turtle.json
33
fe98c60e7d61139aacf2d0872873e610aac8a37b data/advancedperipherals/computercraft/turtle_upgrades/chunky_turtle.json
44
ae619da638ad89d7302d832d6c09e2c87401c539 data/advancedperipherals/computercraft/turtle_upgrades/compass_turtle.json

src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-09-23T21:28:44.4809605 LootTables
1+
// 1.19.2 2025-03-15T16:18:50.465594 LootTables
22
618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
33
0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
44
bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.657381 Recipes
1+
// 1.19.2 2025-03-15T16:18:50.466743 Recipes
22
045608027e4a5ea2d7dee7f402346b8e69f21675 data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json
33
db2dada2fdf42ca1bbf47f1eb075d1f9de89dfa8 data/advancedperipherals/advancements/recipes/advancedperipheralstab/block_reader.json
44
77c55e8500be4a344ca563a8bf7642257cdc7b8b data/advancedperipherals/advancements/recipes/advancedperipheralstab/chat_box.json
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// 1.19.2 2024-05-28T14:53:16.655934 Pocket Computer Upgrades
1+
// 1.19.2 2025-03-15T16:18:50.46512 Pocket Computer Upgrades
22
b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrades/chatty_pocket.json
33
30b8f663613c7ce77048fd69631afcc11a682276 data/advancedperipherals/computercraft/pocket_upgrades/colony_pocket.json
4+
661dc77bd0442bfb2a5ed80cff271071817bb22d data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json
45
d4647159c2f2693a9c5e8d12bf740635751d29a8 data/advancedperipherals/computercraft/pocket_upgrades/environment_pocket.json
56
8216a0a7d8ebe3ae738c8fc3626df25eb0a2e07a data/advancedperipherals/computercraft/pocket_upgrades/geoscanner_pocket.json
67
a38aa83593f7ad0ace98e01bb3b5f06f272ef734 data/advancedperipherals/computercraft/pocket_upgrades/player_pocket.json

src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.658228 Block States: advancedperipherals
1+
// 1.19.2 2025-03-15T16:18:50.466039 Block States: advancedperipherals
22
5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
33
f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
44
1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2025-01-18T00:08:46.0946621 Languages: en_us
2-
d4cb5d2a7d78fc44e503663eb08d67a0fb981deb assets/advancedperipherals/lang/en_us.json
1+
// 1.19.2 2025-03-15T16:18:50.465918 Languages: en_us
2+
fe52123263b91f49093d74278e8709484e4dfe59 assets/advancedperipherals/lang/en_us.json

0 commit comments

Comments
 (0)