Skip to content

Commit 22fcf72

Browse files
committed
Update deps and bump min Neo version to 21.0.142-beta
1 parent bcb7b11 commit 22fcf72

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
642642
//World gen
643643
'biomes-o-plenty',
644644
//Misc
645-
'applied-energistics-2', 'ctm', 'curios-continuation', 'dark-mode-everywhere', 'female-gender-forge', 'flux-networks',
645+
'applied-energistics-2', 'ctm', 'curios-continuation', 'dark-mode-everywhere', 'farmers-delight', 'female-gender-forge', 'flux-networks',
646646
'grandpower', 'json-things', 'perviaminvenire', 'projecte', 'recipe-stages'
647647
)
648648
}

gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ minecraft_version=1.21
99
previous_minecraft_version=1.20.4
1010
previous_minor_minecraft_version=1.20.6
1111
loader_version_range=[4,)
12-
forge_version=21.0.113-beta
12+
forge_version=21.0.143
1313
mod_version=10.6.6
1414
#This determines the minimum version of forge required to use Mekanism
1515
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
16-
forge_version_range=[21.0.110-beta,)
16+
forge_version_range=[21.0.142-beta,)
1717
minecraft_version_range=[1.21]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
@@ -25,7 +25,7 @@ jqwik_version=1.9.0
2525

2626
#NeoGradle Settings
2727
neogradle.subsystems.parchment.minecraftVersion=1.21
28-
neogradle.subsystems.parchment.mappingsVersion=2024.07.07
28+
neogradle.subsystems.parchment.mappingsVersion=2024.07.28
2929
neogradle.subsystems.conventions.sourcesets.enabled=false
3030

3131
#misc settings
@@ -43,11 +43,11 @@ curios_version=9.0.5+1.21
4343
emi_version=1.1.10
4444
grand_power_version=3.0.0
4545
jade_api_id=5427895
46-
jade_id=5529595
47-
jei_version=19.5.0.44
46+
jade_id=5572926
47+
jei_version=19.5.2.66
4848
json_things_version=0.12.0
4949
top_version=1.21_neo-12.0.0-1
50-
wthit_version=12.2.2
50+
wthit_version=12.2.3
5151

5252
#Mod dependency min version ranges
5353

@@ -56,8 +56,9 @@ wthit_version=12.2.2
5656

5757

5858
#Mod dependencies for recipes (only used by our data generators)
59-
ae2_version=19.0.15-alpha
59+
ae2_version=19.0.17-beta
6060
biomesoplenty_version=21.0.0.12
61+
farmers_delight_id=5566383
6162
glitchcore_version=2.0.0.2
6263
terrablender_version=4.0.0.1
6364

@@ -70,5 +71,4 @@ recipe_stages_version=8.0.0.2
7071
wildfire_gender_mod_id=5357649
7172

7273
#Outdated mod dependencies for recipes
73-
farmers_delight_id=5051242
7474
projecte_id=4860859

src/main/java/mekanism/common/item/block/ItemBlockPersonalStorage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import net.minecraft.world.item.context.UseOnContext;
2727
import net.minecraft.world.level.Level;
2828
import net.minecraft.world.level.block.state.BlockState;
29-
import net.neoforged.neoforge.common.util.FakePlayer;
3029
import org.jetbrains.annotations.NotNull;
3130

3231
public class ItemBlockPersonalStorage<BLOCK extends BlockPersonalStorage<?, ?>> extends ItemBlockTooltip<BLOCK> implements IDroppableContents, IGuiItem {
@@ -65,7 +64,7 @@ public InteractionResult useOn(@NotNull UseOnContext context) {
6564
protected boolean canPlace(@NotNull BlockPlaceContext context, @NotNull BlockState state) {
6665
Player player = context.getPlayer();
6766
//Only allow placing if there is no player, it is a fake player, or the player is sneaking
68-
return (player == null || player instanceof FakePlayer || player.isShiftKeyDown()) && super.canPlace(context, state);
67+
return (player == null || player.isFakePlayer() || player.isShiftKeyDown()) && super.canPlace(context, state);
6968
}
7069

7170
@Override

src/main/java/mekanism/common/tile/TileEntityTeleporter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
import net.minecraft.world.phys.Vec3;
7979
import net.neoforged.neoforge.common.NeoForge;
8080
import net.neoforged.neoforge.common.Tags;
81-
import net.neoforged.neoforge.common.util.FakePlayer;
8281
import net.neoforged.neoforge.entity.PartEntity;
8382
import net.neoforged.neoforge.network.PacketDistributor;
8483
import org.jetbrains.annotations.NotNull;
@@ -410,7 +409,7 @@ public static Entity teleportEntityTo(Entity entity, Level targetWorld, TileEnti
410409
//Force re-apply any passengers so that players don't get "stuck" outside what they may be riding
411410
((ServerChunkCache) entity.level().getChunkSource()).broadcast(entity, new ClientboundSetPassengersPacket(entity));
412411
Entity controller = entity.getControllingPassenger();
413-
if (controller != entity && controller instanceof ServerPlayer player && !(controller instanceof FakePlayer)) {
412+
if (controller != entity && controller instanceof ServerPlayer player && !player.isFakePlayer()) {
414413
if (player.connection != null) {
415414
//Force sync the fact that the vehicle moved to the client that is controlling it
416415
// so that it makes sure to use the correct positions when sending move packets
@@ -419,7 +418,7 @@ public static Entity teleportEntityTo(Entity entity, Level targetWorld, TileEnti
419418
}
420419
}
421420
}
422-
if (persistMovement && entity instanceof ServerPlayer player && !(player instanceof FakePlayer)) {
421+
if (persistMovement && entity instanceof ServerPlayer player && !player.isFakePlayer()) {
423422
player.setDeltaMovement(deltaMovement);
424423
//Force sync the delta movement to the client so that they don't stop moving due to the teleport and movement being client sided
425424
PacketDistributor.sendToPlayer(player, new PacketSetDeltaMovement(deltaMovement));

0 commit comments

Comments
 (0)