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

Updated to 1.21.7

Browse Source
This commit is contained in:
Tschipp 2025-08-25 10:49:14 +02:00
parent e7bf9a4dee
commit 162fc1051d
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NeoForge/src/main/java/tschipp/carryon/CarryOnNeoForgeClient.java
View File

@ -4,9 +4,11 @@ import net.neoforged.api.distmarker.Dist;
import net.neoforged.fml.ModContainer; import net.neoforged.fml.ModContainer;
import net.neoforged.fml.common.Mod; import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
import tschipp.carryon.compat.ClothConfigCompatNeo; import tschipp.carryon.compat.ClothConfigCompatNeo;
import tschipp.carryon.config.BuiltConfig; import tschipp.carryon.config.BuiltConfig;
import tschipp.carryon.config.neoforge.ConfigLoaderImpl; import tschipp.carryon.config.neoforge.ConfigLoaderImpl;
import tschipp.carryon.networking.PacketBase;
import tschipp.carryon.platform.Services; import tschipp.carryon.platform.Services;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -24,4 +26,8 @@ public class CarryOnNeoForgeClient {
} }
} }
public static void sendPacketToServer(PacketBase packet) {
ClientPacketDistributor.sendToServer(packet);
}
} }

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

@ -26,7 +26,6 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.fml.common.Mod; import net.neoforged.fml.common.Mod;
@ -44,7 +43,6 @@ import tschipp.carryon.common.carry.CarryOnDataManager;
@EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT) @EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT)
public class ClientEvents { public class ClientEvents {
@OnlyIn(Dist.CLIENT)
@SubscribeEvent @SubscribeEvent
public static void renderHand(RenderHandEvent event) public static void renderHand(RenderHandEvent event)
{ {
@ -58,14 +56,12 @@ public class ClientEvents {
event.setCanceled(true); event.setCanceled(true);
} }
@OnlyIn(Dist.CLIENT)
@SubscribeEvent @SubscribeEvent
public static void onRenderLevel(RenderLevelStageEvent.AfterParticles event) public static void onRenderLevel(RenderLevelStageEvent.AfterParticles event)
{ {
CarriedObjectRender.drawThirdPerson(event.getPartialTick().getGameTimeDeltaPartialTick(true), event.getPoseStack().last().pose()); CarriedObjectRender.drawThirdPerson(event.getPartialTick().getGameTimeDeltaPartialTick(true), event.getPoseStack().last().pose());
} }
@OnlyIn(Dist.CLIENT)
@SubscribeEvent @SubscribeEvent
public static void onGuiInit(ScreenEvent.Init.Pre event) public static void onGuiInit(ScreenEvent.Init.Pre event)
{ {
@ -89,7 +85,6 @@ public class ClientEvents {
} }
} }
@OnlyIn(Dist.CLIENT)
@SubscribeEvent @SubscribeEvent
public static void onClientTick(ClientTickEvent.Post event) public static void onClientTick(ClientTickEvent.Post event)
{ {

1
NeoForge/src/main/java/tschipp/carryon/events/ModClientEvents.java
View File

@ -32,7 +32,6 @@ import tschipp.carryon.client.keybinds.CarryOnKeybinds;
@EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT) @EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT)
public class ModClientEvents public class ModClientEvents
{ {
@OnlyIn(Dist.CLIENT)
@SubscribeEvent @SubscribeEvent
public static void registerKeybinds(RegisterKeyMappingsEvent event) public static void registerKeybinds(RegisterKeyMappingsEvent event)
{ {

5
NeoForge/src/main/java/tschipp/carryon/platform/NeoForgePlatformHelper.java
View File

@ -20,7 +20,6 @@
package tschipp.carryon.platform; package tschipp.carryon.platform;
import io.netty.buffer.ByteBuf;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.codec.StreamCodec;
@ -36,10 +35,10 @@ import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.network.handling.IPayloadHandler; import net.neoforged.neoforge.network.handling.IPayloadHandler;
import net.neoforged.neoforge.network.registration.PayloadRegistrar; import net.neoforged.neoforge.network.registration.PayloadRegistrar;
import tschipp.carryon.CarryOnCommonClient; import tschipp.carryon.CarryOnCommonClient;
import tschipp.carryon.CarryOnNeoForgeClient;
import tschipp.carryon.config.BuiltConfig; import tschipp.carryon.config.BuiltConfig;
import tschipp.carryon.config.neoforge.ConfigLoaderImpl; import tschipp.carryon.config.neoforge.ConfigLoaderImpl;
import tschipp.carryon.networking.PacketBase; import tschipp.carryon.networking.PacketBase;
import tschipp.carryon.networking.serverbound.ServerboundCarryKeyPressedPacket;
import tschipp.carryon.platform.services.IPlatformHelper; import tschipp.carryon.platform.services.IPlatformHelper;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@ -100,7 +99,7 @@ public class NeoForgePlatformHelper implements IPlatformHelper {
@Override @Override
public void sendPacketToServer(ResourceLocation id, PacketBase packet) { public void sendPacketToServer(ResourceLocation id, PacketBase packet) {
PacketDistributor.sendToServer(packet); CarryOnNeoForgeClient.sendPacketToServer(packet);
} }
@Override @Override

2
build.gradle
View File

@ -2,5 +2,5 @@ plugins {
// see https://fabricmc.net/develop/ for new versions // see https://fabricmc.net/develop/ for new versions
id 'fabric-loom' version '1.10-SNAPSHOT' apply false id 'fabric-loom' version '1.10-SNAPSHOT' apply false
// see https://projects.neoforged.net/neoforged/moddevgradle for new versions // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
id 'net.neoforged.moddev' version '2.0.62-beta' apply false id 'net.neoforged.moddev' version "${mod_dev_version}" apply false
} }

30
gradle.properties
View File

@ -1,36 +1,36 @@
# Project # Project
version=2.5.0 version=2.6.0
group=tschipp.carryon group=tschipp.carryon
# Common # Common
minecraft_version=1.21.6 minecraft_version=1.21.7
mod_name=Carry On mod_name=Carry On
mod_author=Tschipp, PurpliciousCow mod_author=Tschipp, PurpliciousCow
mod_id=carryon mod_id=carryon
license=GNU LGPLv3 license=GNU LGPLv3
credits= 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. 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.6, 1.22) minecraft_version_range=[1.21.7, 1.22)
neo_form_version=1.21.6-20250617.151856 neo_form_version=1.21.7-20250711.194848
java_version=21 java_version=21
parchment_version=2025.06.29 parchment_version=2025.07.18
mod_dev_version=2.0.107
# Forge # Forge
forge_version=56.0.9 forge_version=57.0.3
forge_loader_version_range=[55,) forge_loader_version_range=[56,)
parchment_mappings=2025.06.29-1.21.6 parchment_mappings=2025.07.18-1.21.7
//forge_ats_enabled=true //forge_ats_enabled=true
# Fabric # Fabric
fabric_version=0.128.2+1.21.6 fabric_version=0.129.0+1.21.7
fabric_loader_version=0.16.14 fabric_loader_version=0.17.2
parchment_mappings_fabric=1.21.6:2025.06.29 parchment_mappings_fabric=1.21.7:2025.07.18
# Neoforge # Neoforge
neoforge_version=21.6.20-beta neoforge_version=21.7.25-beta
neoforge_loader_version_range=[4,) neoforge_loader_version_range=[4,)
neogradle.subsystems.parchment.minecraftVersion=1.21.6 neogradle.subsystems.parchment.minecraftVersion=1.21.7
neogradle.subsystems.parchment.mappingsVersion=2025.06.29 neogradle.subsystems.parchment.mappingsVersion=2025.07.18
# Gradle # Gradle

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists