firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[PORT] 1.20.6 port

Browse Source
This commit is contained in:
HypherionSA
2024-05-05 23:07:50 +02:00
parent 6dabc7e441
commit 6b6c53265b
29 changed files with 204 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -12,7 +12,7 @@
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

19
Common/src/main/java/com/hypherionmc/craterlib/api/networking/CommonPacketWrapper.java Normal file
View File

@@ -0,0 +1,19 @@
package com.hypherionmc.craterlib.api.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
public record CommonPacketWrapper<T>(PacketHolder<T> container, T packet) implements CustomPacketPayload
{
public void encode(BridgedFriendlyByteBuf buf)
{
container().encoder().accept(packet(), buf);
}
@Override
public Type<? extends CustomPacketPayload> type()
{
return container.type();
}
}

2
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
View File

@@ -269,7 +269,7 @@ public class CraterConfigScreen extends Screen {
Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder();
RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();

12
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java
View File

@@ -1,5 +1,7 @@
package com.hypherionmc.craterlib.client.gui.config.widgets;
import lombok.Getter;
import lombok.Setter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
@@ -28,16 +30,10 @@ public abstract class Option<T> extends AbstractContainerEventHandler {
public T value;
public boolean hasErrors;
public List<? extends GuiEventListener> children = new ArrayList<>();
@Setter
@Getter
private List<String> langKeys = new ArrayList<>();
public List<String> getLangKeys() {
return langKeys;
}
public void setLangKeys(List<String> langKeys) {
this.langKeys = langKeys;
}
public abstract void render(Minecraft minecraft, Font font, int x, int y, int width, int height, GuiGraphics matrices, int mouseX, int mouseY, float delta);
public int height() {

5
Common/src/main/java/com/hypherionmc/craterlib/core/networking/CraterPacketNetwork.java
View File

@@ -3,6 +3,7 @@ package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import lombok.Getter;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -11,6 +12,7 @@ import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
@Getter
public class CraterPacketNetwork {
private final PacketRegistry packetRegistry;
@@ -38,7 +40,4 @@ public class CraterPacketNetwork {
}
}
public PacketRegistry getPacketRegistry() {
return packetRegistry;
}
}

2
Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistry.java
View File

@@ -18,7 +18,7 @@ import java.util.function.Function;
*/
public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegistrar {
final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
protected final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
protected final PacketSide side;

24
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java
View File

@@ -1,7 +1,11 @@
package com.hypherionmc.craterlib.core.networking.data;
import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -10,9 +14,27 @@ import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record PacketHolder<T>(ResourceIdentifier packetId,
public record PacketHolder<T>(CustomPacketPayload.Type<? extends CustomPacketPayload> type,
Class<T> messageType,
BiConsumer<T, BridgedFriendlyByteBuf> encoder,
Function<BridgedFriendlyByteBuf, T> decoder,
Consumer<PacketContext<T>> handler) {
public PacketHolder(ResourceIdentifier packetId, Class<T> messageType, BiConsumer<T, BridgedFriendlyByteBuf> encoder, Function<BridgedFriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
this(new CustomPacketPayload.Type<>(packetId.toMojang()), messageType, encoder, decoder, handler);
}
@SuppressWarnings("unchecked")
public <K extends CustomPacketPayload> CustomPacketPayload.Type<K> getType()
{
return (CustomPacketPayload.Type<K>) type();
}
public StreamCodec<FriendlyByteBuf, CommonPacketWrapper> getCodec()
{
return CustomPacketPayload.codec(
(packet, buf) -> this.encoder().accept((T)packet.packet(), BridgedFriendlyByteBuf.of(buf)),
(buf) -> new CommonPacketWrapper<>(this, this.decoder().apply(BridgedFriendlyByteBuf.of(buf))));
}
}

4
Common/src/main/java/com/hypherionmc/craterlib/nojang/client/multiplayer/BridgedServerData.java
View File

@@ -24,9 +24,9 @@ public class BridgedServerData {
}
public int getMaxPlayers() {
if (!internal.pinged || internal.players == null) {
if (internal.players == null) {
try {
new ServerStatusPinger().pingServer(internal, () -> {});
new ServerStatusPinger().pingServer(internal, () -> {}, () -> {});
} catch (Exception ignored) {}
}

5
Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
View File

@@ -7,6 +7,7 @@ import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.minecraft.ChatFormatting;
import net.minecraft.Util;
import net.minecraft.core.RegistryAccess;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
@@ -14,11 +15,11 @@ public class ChatUtils {
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = GsonComponentSerializer.gson().serialize(inComponent);
return Component.Serializer.fromJson(serialised);
return Component.Serializer.fromJson(serialised, RegistryAccess.EMPTY);
}
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
final String serialised = Component.Serializer.toJson(inComponent);
final String serialised = Component.Serializer.toJson(inComponent, RegistryAccess.EMPTY);
return GsonComponentSerializer.gson().deserialize(serialised);
}

2
Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
View File

@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
public ServerPlayer player;
@Inject(
method = "lambda$handleChat$6",
method = "lambda$handleChat$5",
at = @At("HEAD"),
cancellable = true
)

78
Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
View File

@@ -1,55 +1,46 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.FriendlyByteBuf;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterFabricNetworkHandler extends PacketRegistry {
private final Map<Class<?>, Message<?>> CHANNELS = new HashMap();
public CraterFabricNetworkHandler(PacketSide side) {
super(side);
}
protected <T> void registerPacket(PacketHolder<T> holder) {
if (CHANNELS.get(holder.messageType()) == null) {
CHANNELS.put(holder.messageType(), new Message<>(holder.packetId(), holder.encoder()));
if (PacketSide.CLIENT.equals(this.side)) {
ClientPlayNetworking.registerGlobalReceiver(holder.packetId().toMojang(), ((client, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
client.execute(() -> holder.handler().accept(new PacketContext<>(message, PacketSide.CLIENT)));
}));
} else {
ServerPlayNetworking.registerGlobalReceiver(holder.packetId().toMojang(), ((server, player, listener, buf, responseSender) -> {
buf.readByte();
T message = holder.decoder().apply(BridgedFriendlyByteBuf.of(buf));
server.execute(() -> holder.handler().accept(new PacketContext<>(BridgedPlayer.of(player), message, PacketSide.SERVER)));
}));
}
} else {
CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
try
{
PayloadTypeRegistry.playC2S().register(holder.getType(), holder.getCodec());
PayloadTypeRegistry.playS2C().register(holder.getType(), holder.getCodec());
}
catch (IllegalArgumentException e)
{
// do nothing
}
if (PacketSide.CLIENT.equals(this.side)) {
ClientPlayNetworking.registerGlobalReceiver(holder.getType(),
(ClientPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.client().execute(() ->
holder.handler().accept(
new PacketContext<>(payload.packet(), side))));
}
ServerPlayNetworking.registerGlobalReceiver(holder.getType(),
(ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() ->
holder.handler().accept(
new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side))));
}
public <T> void sendToServer(T packet) {
@@ -57,26 +48,21 @@ public class CraterFabricNetworkHandler extends PacketRegistry {
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (ClientPlayNetworking.canSend(message.id().toMojang()) || ignoreCheck) {
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
ClientPlayNetworking.send(message.id().toMojang(), buf);
if (container != null) {
if (ignoreCheck || ClientPlayNetworking.canSend(container.type().id())) {
ClientPlayNetworking.send(new CommonPacketWrapper<>(container, packet));
}
}
}
public <T> void sendToClient(T packet, BridgedPlayer player) {
Message<T> message = (Message<T>) CHANNELS.get(packet.getClass());
if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), message.id().toMojang()))
{
FriendlyByteBuf buf = PacketByteBufs.create();
buf.writeByte(0);
message.encoder().accept(packet, BridgedFriendlyByteBuf.of(buf));
ServerPlayNetworking.send(player.toMojangServerPlayer(), message.id().toMojang(), buf);
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (container != null) {
if (ServerPlayNetworking.canSend(player.toMojangServerPlayer(), container.type().id())) {
ServerPlayNetworking.send(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
}
}
}
public record Message<T>(ResourceIdentifier id, BiConsumer<T, BridgedFriendlyByteBuf> encoder) { }
}

6
Fabric/src/main/resources/fabric.mod.json
View File

@@ -31,9 +31,9 @@
"${mod_id}.fabric.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.21",
"fabricloader": ">=0.15.0",
"fabric-api": "*",
"minecraft": ">=1.20.4",
"java": ">=17"
"minecraft": ">=1.20.6",
"java": ">=21"
}
}

2
Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
View File

@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
public ServerPlayer player;
@Inject(
method = "lambda$handleChat$6",
method = "lambda$handleChat$5",
at = @At("HEAD"),
cancellable = true
)

2
Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java
View File

@@ -36,7 +36,7 @@ public class CraterForgeNetworkHandler extends PacketRegistry {
protected <T> void registerPacket(PacketHolder<T> holder) {
if (CHANNELS.get(holder.messageType()) == null) {
SimpleChannel channel = ChannelBuilder
.named(holder.packetId().toMojang())
.named(holder.type().id())
.clientAcceptedVersions((a, b) -> true)
.serverAcceptedVersions((a, b) -> true)
.networkProtocolVersion(1)

44
Forge/src/main/resources/META-INF/mods.toml
View File

@@ -1,31 +1,31 @@
modLoader = "javafml"
loaderVersion = "[49,)"
loaderVersion = "[50,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[mods]]
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "MATCH_VERSION"
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "NONE"
[[dependencies.${ mod_id }]]
modId = "forge"
mandatory = true
versionRange = "[49,)"
ordering = "NONE"
side = "BOTH"
modId = "forge"
mandatory = true
versionRange = "[50,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.4,1.21)"
ordering = "NONE"
side = "BOTH"
modId = "minecraft"
mandatory = true
versionRange = "[1.20.6,1.21)"
ordering = "NONE"
side = "BOTH"

2
NeoForge/build.gradle
View File

@@ -50,7 +50,7 @@ processResources {
from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone()
filesMatching("META-INF/mods.toml") {
filesMatching("META-INF/neoforge.mods.toml") {
expand buildProps
}
}

15
NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
View File

@@ -1,8 +1,12 @@
package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.common.NeoForgeServerEvents;
import com.hypherionmc.craterlib.compat.Vanish;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
@@ -13,12 +17,16 @@ import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
import net.minecraft.client.Minecraft;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModList;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
import net.neoforged.neoforge.common.NeoForge;
import java.util.Optional;
@Mod(CraterConstants.MOD_ID)
public class CraterLib {
@@ -39,6 +47,13 @@ public class CraterLib {
if (FMLEnvironment.dist.isClient()) {
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
CraterEventBus.INSTANCE.postEvent(event);
ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
ModuleConfig config = (ModuleConfig) conf;
ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
}
});
}
}
}

10
NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java
View File

@@ -7,15 +7,15 @@ import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
import net.minecraft.client.Minecraft;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.tick.LevelTickEvent;
@Mod.EventBusSubscriber(modid = CraterConstants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
@EventBusSubscriber(modid = CraterConstants.MOD_ID, value = Dist.CLIENT)
public class NeoForgeClientEvents {
@SubscribeEvent
public static void clientTick(TickEvent.LevelTickEvent event) {
if (event.level == null)
public static void clientTick(LevelTickEvent.Pre event) {
if (Minecraft.getInstance().level == null)
return;
CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));

43
NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -1,43 +0,0 @@
package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.neoforged.neoforge.client.ConfigScreenHandler;
import net.neoforged.neoforgespi.language.IModInfo;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Optional;
import java.util.function.BiFunction;
/**
* @author HypherionSA
*/
@Mixin(ConfigScreenHandler.class)
public class ConfigScreenHandlerMixin {
/**
* Inject Auto Generated config Screens into forge
*
*/
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
ModuleConfig config = (ModuleConfig) conf;
if (config.getModId().equals(selectedMod.getModId())) {
cir.setReturnValue(
Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
);
}
}
});
}
}

2
NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
View File

@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
public ServerPlayer player;
@Inject(
method = "lambda$handleChat$6",
method = "lambda$handleChat$5",
at = @At("HEAD"),
cancellable = true
)

89
NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java
View File

@@ -1,70 +1,40 @@
package com.hypherionmc.craterlib.network;
import com.hypherionmc.craterlib.CraterConstants;
import com.hypherionmc.craterlib.api.networking.CommonPacketWrapper;
import com.hypherionmc.craterlib.core.networking.PacketRegistry;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Player;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import net.neoforged.neoforge.network.registration.IPayloadRegistrar;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterNeoForgeNetworkHandler extends PacketRegistry {
private final Map<Class<?>, NeoForgePacketContainer> PACKETS = new HashMap<>();
public CraterNeoForgeNetworkHandler(PacketSide side) {
super(side);
}
@SubscribeEvent
public void register(final RegisterPayloadHandlerEvent event) {
if (!PACKETS.isEmpty()) {
PACKETS.forEach((type, container) -> {
final IPayloadRegistrar registrar = event.registrar(container.packetId().getNamespace());
registrar.common(
container.packetId(),
container.decoder(),
container.handler());
});
public void register(final RegisterPayloadHandlersEvent event) {
if (!PACKET_MAP.isEmpty()) {
PACKET_MAP.forEach((type, container) -> event.registrar(container.getType().id().getNamespace())
.optional().commonBidirectional(container.getType(), container.getCodec(), buildHandler(container.handler())));
}
}
@Override
protected <T> void registerPacket(PacketHolder<T> container) {
if (PACKETS.get(container.messageType()) == null) {
var packetContainer = new NeoForgePacketContainer<>(
container.messageType(),
container.packetId().toMojang(),
mojangEncoder(container.encoder()),
decoder(mojangDecoder(container.decoder())),
buildHandler(container.handler())
);
PACKETS.put(container.messageType(), packetContainer);
}
}
private <T> FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder(Function<FriendlyByteBuf, T> decoder) {
return (buf -> {
T packet = decoder.apply(buf);
return new NeoForgePacket<T>(PACKETS.get(packet.getClass()), packet);
});
}
public <T> void sendToServer(T packet) {
@@ -72,45 +42,36 @@ public class CraterNeoForgeNetworkHandler extends PacketRegistry {
}
public <T> void sendToServer(T packet, boolean ignoreCheck) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
PacketDistributor.SERVER.noArg().send(new NeoForgePacket<>(container, packet));
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the client, this is needed.", packet.getClass(), t);
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (container != null) {
PacketDistributor.sendToServer(new CommonPacketWrapper<>(container, packet));
}
}
public <T> void sendToClient(T packet, BridgedPlayer player) {
NeoForgePacketContainer<T> container = PACKETS.get(packet.getClass());
try {
if (player.getConnection() == null)
return;
if (player.getConnection().isConnected(container.packetId())) {
PacketDistributor.PLAYER.with(player.toMojangServerPlayer()).send(new NeoForgePacket<>(container, packet));
PacketHolder<T> container = (PacketHolder<T>) PACKET_MAP.get(packet.getClass());
if (container != null) {
if (player.getConnection().hasChannel(container.type())) {
PacketDistributor.sendToPlayer(player.toMojangServerPlayer(), new CommonPacketWrapper<>(container, packet));
}
} catch (Throwable t) {
CraterConstants.LOG.error("{} packet not registered on the server, this is needed.", packet.getClass(), t);
}
}
private <T, K extends NeoForgePacket<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
private <T, K extends CommonPacketWrapper<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
return (payload, ctx) -> {
try {
try
{
PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
Player player = ctx.player().orElse(null);
handler.accept(new PacketContext<>(BridgedPlayer.of(player), payload.packet(), side));
} catch (Throwable t) {
if (PacketSide.SERVER.equals(side)) {
handler.accept(new PacketContext<>(BridgedPlayer.of(ctx.player()), payload.packet(), side));
} else {
handler.accept(new PacketContext<>(payload.packet(), side));
}
}
catch (Throwable t) {
CraterConstants.LOG.error("Error handling packet: {} -> ", payload.packet().getClass(), t);
}
};
}
private <T> Function<FriendlyByteBuf, T> mojangDecoder(Function<BridgedFriendlyByteBuf, T> handler) {
return byteBuf -> handler.apply(BridgedFriendlyByteBuf.of(byteBuf));
}
private <T> BiConsumer<T, FriendlyByteBuf> mojangEncoder(BiConsumer<T, BridgedFriendlyByteBuf> handler) {
return ((t, byteBuf) -> handler.accept(t, BridgedFriendlyByteBuf.of(byteBuf)));
}
}

24
NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgePacket.java
View File

@@ -1,24 +0,0 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.NotNull;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacket<T>(NeoForgePacketContainer<T> container, T packet) implements CustomPacketPayload {
@Override
public void write(@NotNull FriendlyByteBuf buff)
{
container().encoder().accept(packet(), buff);
}
@Override
public @NotNull ResourceLocation id()
{
return container().packetId();
}
}

16
NeoForge/src/main/java/com/hypherionmc/craterlib/network/NeoForgePacketContainer.java
View File

@@ -1,16 +0,0 @@
package com.hypherionmc.craterlib.network;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.neoforge.network.handling.IPayloadHandler;
import java.util.function.BiConsumer;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record NeoForgePacketContainer<T>(Class<T> messageType,
ResourceLocation packetId,
BiConsumer<T, FriendlyByteBuf> encoder,
FriendlyByteBuf.Reader<NeoForgePacket<T>> decoder,
IPayloadHandler<NeoForgePacket<T>> handler) { }

31
NeoForge/src/main/resources/META-INF/mods.toml
View File

@@ -1,31 +0,0 @@
modLoader = "javafml"
loaderVersion = "[1,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[mods]]
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "MATCH_VERSION"
[[dependencies.${ mod_id }]]
modId = "neoforge"
mandatory = true
versionRange = "[20.4,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.4,1.21)"
ordering = "NONE"
side = "BOTH"

31
NeoForge/src/main/resources/META-INF/neoforge.mods.toml Normal file
View File

@@ -0,0 +1,31 @@
modLoader = "javafml"
loaderVersion = "[1,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[mods]]
modId = "${mod_id}"
version = "${version}"
displayName = "${mod_name}"
displayURL = "https://modrinth.com/mod/craterlib"
logoFile = "craterlib_logo.png"
#credits="Thanks for this example mod goes to Java"
authors = "${mod_author}, Zenith"
description = '''
A library mod used by First Dark Development and HypherionSA Mods
'''
displayTest = "NONE"
[[dependencies.${ mod_id }]]
modId = "neoforge"
type="required"
versionRange = "[20.6,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${ mod_id }]]
modId = "minecraft"
type="required"
versionRange = "[1.20.6,1.21)"
ordering = "NONE"
side = "BOTH"

4
NeoForge/src/main/resources/craterlib.neoforge.mixins.json
View File

@@ -5,9 +5,7 @@
"compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [
"ConfigScreenHandlerMixin"
],
"client": [],
"server": [
"ServerGamePacketListenerImplMixin"
],

2
build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.1.0-SNAPSHOT" apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false
id "me.hypherionmc.modutils.modpublisher" version "1.0.23+"
id "com.hypherionmc.modutils.orion" version "1.0.10"
id 'maven-publish'

14
gradle.properties
View File

@@ -9,18 +9,18 @@ mod_id=craterlib
mod_name=CraterLib
# Shared
minecraft_version=1.20.4
minecraft_version=1.20.6
project_group=com.hypherionmc.craterlib
# Fabric
fabric_loader=0.15.0
fabric_api=0.92.0+1.20.4
fabric_api=0.97.8+1.20.6
# Forge
forge_version=49.0.13
forge_version=50.0.6
# NeoForged
neoforge_version=73-beta
neoforge_version=41-beta
# Dependencies
moon_config=1.0.9
@@ -30,9 +30,9 @@ rpc_sdk=1.0
discord_formatter=2.0.0
# Mod Dependencies
fabrictailor=2.1.2
vanish=1.4.2+1.20
mod_menu_version=8.0.0-beta.2
fabrictailor=2.3.1
vanish=1.5.4+1.20.5
mod_menu_version=10.0.0-beta.1
vanishmod=1.1.12.1
vanishmod_neo=puxrKAMr

3
settings.gradle
View File

@@ -11,5 +11,4 @@ pluginManagement {
}
rootProject.name = 'CraterLib'
include("Common", "Fabric", "Forge")
include 'NeoForge'
include("Common", "Fabric", "NeoForge", "Forge")