kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix compat with FTB Chunks (and likely many other protection mods)

Browse source 
# Conflicts:
#	src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java
This commit is contained in:
kalle 2025-07-16 12:38:16 +02:00
parent 0f32897ecc
commit 37b263ed35
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.gradle
View file

@ -162,6 +162,13 @@ dependencies {
runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
implementation "curse.maven:jade-324717:6291517"
// FTB Chunks integration
runtimeOnly("curse.maven:ftb-chunks-forge-314906:${ftbchunks_version}")
runtimeOnly("curse.maven:architectury-api-419699:5786327")
runtimeOnly("curse.maven:ftb-library-forge-404465:6711324")
runtimeOnly("curse.maven:ftb-ranks-forge-314905:6431744")
runtimeOnly("curse.maven:ftb-teams-forge-404468:6119437")
// 帕秋莉手册
compileOnly "curse.maven:patchouli-306770:6164617"
runtimeOnly "curse.maven:patchouli-306770:6164617"

3
gradle.properties
View file

@ -21,4 +21,5 @@ mod_authors=Atsuishio, Roki27, Light_Quanta
# dependencies
jei_version=19.21.0.247
cloth_config_version=11.1.106
jade_version=4681833
jade_version=4681833
ftbchunks_version=5448646

2
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java
View file

@ -653,6 +653,7 @@ public abstract class VehicleEntity extends Entity implements Container {
ItemStack stack = player.getMainHandItem();
if (player.isShiftKeyDown() && stack.is(ModTags.Items.CROWBAR) && this.getPassengers().isEmpty()) {
if (!(player instanceof ServerPlayer)) return InteractionResult.PASS;
ItemStack container = ContainerBlockItem.createInstance(this);
if (!player.addItem(container)) {
player.drop(container, false);
@ -671,6 +672,7 @@ public abstract class VehicleEntity extends Entity implements Container {
}
return InteractionResult.SUCCESS;
} else if (!player.isShiftKeyDown()) {
if (!(player instanceof ServerPlayer)) return InteractionResult.PASS;
if (this.getFirstPassenger() == null) {
if (player instanceof FakePlayer) return InteractionResult.PASS;
setDriverAngle(player);