R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated version, fixed 1.21.4

Browse Source
This commit is contained in:
Tschipp 2025-04-20 23:40:51 +02:00
parent 67db9798d8
commit 24c15ffb7b
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java
View File

@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtOps;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.nbt.Tag;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntitySpawnReason;
@ -96,7 +97,7 @@ public class CarryOnData {
return null;
}
public void setBlock(BlockState state, @Nullable BlockEntity tile)
public void setBlock(BlockState state, @Nullable BlockEntity tile, ServerPlayer player, BlockPos pos)
{
this.type = CarryType.BLOCK;

2
Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
View File

@ -136,7 +136,7 @@ public class PickupHandler {
player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd);
}
carry.setBlock(state, blockEntity);
carry.setBlock(state, blockEntity, player, pos);
level.removeBlockEntity(pos);
level.removeBlock(pos, false);

2
Forge/build.gradle
View File

@ -36,7 +36,7 @@ jarJar.enable()
build.dependsOn tasks.jarJar
minecraft {
mappings channel: 'parchment', version: "${parchment_mappings}"
mappings channel: 'official', version: "1.21.4"
copyIdeResources = true
reobf = false

5
NeoForge/src/main/java/tschipp/carryon/events/CommonEvents.java
View File

@ -21,6 +21,7 @@
package tschipp.carryon.events;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
@ -147,9 +148,9 @@ public class CommonEvents
}
@SubscribeEvent
public static void onDatapackRegister(AddReloadListenerEvent event)
public static void onDatapackRegister(AddServerReloadListenersEvent event)
{
event.addListener(new ScriptReloadListener());
event.addListener(ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "scripts"), new ScriptReloadListener());
}
@SubscribeEvent

14
gradle.properties
View File

@ -12,22 +12,22 @@ credits=
description=Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands.
minecraft_version_range=[1.21.4, 1.22)
# Forge
forge_version=54.0.12
forge_version=54.1.3
forge_loader_version_range=[54,)
forge_version_range=[54,)
parchment_mappings=2024.12.29-1.21.4
parchment_mappings=2025.03.23-1.21.4
//forge_ats_enabled=true
# Fabric
fabric_version=0.113.0+1.21.4
fabric_loader_version=0.16.9
parchment_mappings_fabric=1.21.4:2024.12.29
fabric_version=0.119.2+1.21.4
fabric_loader_version=0.16.13
parchment_mappings_fabric=1.21.4:2025.03.23
# Neoforge
neoforge_version=21.4.47-beta
neoforge_version=21.4.132
neoforge_loader_version_range=[4,)
neogradle.subsystems.parchment.minecraftVersion=1.21.4
neogradle.subsystems.parchment.mappingsVersion=2024.12.29
neogradle.subsystems.parchment.mappingsVersion=2025.03.23
# Gradle