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

[NO-ORBIT] Unified Porting Branch

Browse Source
This commit is contained in:
HypherionSA
2024-05-19 19:08:42 +02:00
parent f64efbd228
commit be3fc20246
277 changed files with 8174 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch Normal file
View File

@@ -0,0 +1,62 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java
+++ /dev/null
@@ -1,59 +1,0 @@
-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;
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import com.hypherionmc.craterlib.network.CraterNeoForgeNetworkHandler;
-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 {
-
- private final PacketRegistry handler;
-
- public CraterLib(IEventBus eventBus) {
- NeoForge.EVENT_BUS.register(new NeoForgeServerEvents());
- eventBus.addListener(this::commonSetup);
- handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER);
-
- if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) {
- eventBus.register(new Vanish());
- }
- }
-
- public void commonSetup(FMLCommonSetupEvent evt) {
- new CraterPacketNetwork(handler);
- 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))));
- }
- });
- }
- }
-}

28
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java.patch Normal file
View File

@@ -0,0 +1,28 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientEvents.java
+++ /dev/null
@@ -1,25 +1,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.CraterConstants;
-import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-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.EventBusSubscriber;
-import net.neoforged.neoforge.event.tick.LevelTickEvent;
-
-@EventBusSubscriber(modid = CraterConstants.MOD_ID, value = Dist.CLIENT)
-public class NeoForgeClientEvents {
-
- @SubscribeEvent
- public static void clientTick(LevelTickEvent.Pre event) {
- if (Minecraft.getInstance().level == null)
- return;
-
- CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
- CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
- }
-
-}

43
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch Normal file
View File

@@ -0,0 +1,43 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null
@@ -1,40 +1,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.Connection;
-
-import java.util.Objects;
-
-/**
- * @author HypherionSA
- */
-public class NeoForgeClientHelper implements ClientPlatform {
-
- public NeoForgeClientHelper() {
- }
-
- @Override
- public BridgedMinecraft getClientInstance() {
- return new BridgedMinecraft();
- }
-
- @Override
- public BridgedPlayer getClientPlayer() {
- return BridgedPlayer.of(Minecraft.getInstance().player);
- }
-
- @Override
- public BridgedClientLevel getClientLevel() {
- return BridgedClientLevel.of(Minecraft.getInstance().level);
- }
-
- @Override
- public Connection getClientConnection() {
- Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
- return Minecraft.getInstance().getConnection().getConnection();
- }
-}

22
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java.patch Normal file
View File

@@ -0,0 +1,22 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
+++ /dev/null
@@ -1,19 +1,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
-import net.neoforged.neoforge.server.ServerLifecycleHooks;
-
-/**
- * @author HypherionSA
- */
-public class NeoForgeCommonHelper implements CommonPlatform {
-
- public NeoForgeCommonHelper() {
- }
-
- @Override
- public BridgedMinecraftServer getMCServer() {
- return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
- }
-}

25
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch Normal file
View File

@@ -0,0 +1,25 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java
+++ /dev/null
@@ -1,22 +1,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import redstonedubstep.mods.vanishmod.VanishUtil;
-
-public class NeoForgeCompatHelper implements CompatUtils {
-
- @Override
- public boolean isPlayerActive(BridgedPlayer player) {
- if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
- return true;
-
- return VanishUtil.isVanished(player.toMojangServerPlayer());
- }
-
- @Override
- public String getSkinUUID(BridgedPlayer player) {
- return player.getStringUUID();
- }
-}

76
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java.patch Normal file
View File

@@ -0,0 +1,76 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeLoaderHelper.java
+++ /dev/null
@@ -1,73 +1,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.Environment;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.loading.FMLLoader;
-import net.neoforged.fml.loading.FMLPaths;
-
-import java.io.File;
-
-/**
- * @author HypherionSA
- */
-public class NeoForgeLoaderHelper implements ModloaderEnvironment {
-
- public NeoForgeLoaderHelper() {
- }
-
- @Override
- public boolean isFabric() {
- return false;
- }
-
- @Override
- public String getGameVersion() {
- return SharedConstants.VERSION_STRING;
- }
-
- @Override
- public File getGameFolder() {
- return Minecraft.getInstance().gameDirectory;
- }
-
- @Override
- public File getConfigFolder() {
- return FMLPaths.CONFIGDIR.get().toFile();
- }
-
- @Override
- public File getModsFolder() {
- return FMLPaths.MODSDIR.get().toFile();
- }
-
- @Override
- public Environment getEnvironment() {
- switch (FMLLoader.getDist()) {
- case CLIENT -> {
- return Environment.CLIENT;
- }
- case DEDICATED_SERVER -> {
- return Environment.SERVER;
- }
- }
- return Environment.UNKNOWN;
- }
-
- @Override
- public boolean isModLoaded(String modid) {
- return ModList.get().isLoaded(modid);
- }
-
- @Override
- public boolean isDevEnv() {
- return !FMLLoader.isProduction();
- }
-
- @Override
- public int getModCount() {
- return ModList.get().size();
- }
-}

46
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java.patch Normal file
View File

@@ -0,0 +1,46 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java
+++ /dev/null
@@ -1,43 +1,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
-import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.event.RegisterCommandsEvent;
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
-import net.neoforged.neoforge.event.server.ServerStartingEvent;
-import net.neoforged.neoforge.event.server.ServerStoppedEvent;
-import net.neoforged.neoforge.event.server.ServerStoppingEvent;
-
-public class NeoForgeServerEvents {
-
- @SubscribeEvent
- public void serverStarting(ServerStartingEvent event) {
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(BridgedMinecraftServer.of(event.getServer())));
- }
-
- @SubscribeEvent
- public void serverStarted(ServerStartedEvent event) {
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started(BridgedMinecraftServer.of(event.getServer())));
- }
-
- @SubscribeEvent
- public void serverStopping(ServerStoppingEvent event) {
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping(BridgedMinecraftServer.of(event.getServer())));
- }
-
- @SubscribeEvent
- public void serverStopped(ServerStoppedEvent event) {
- CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped(BridgedMinecraftServer.of(event.getServer())));
- }
-
- @SubscribeEvent
- public void onCommandRegister(RegisterCommandsEvent event) {
- CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
- CommandsRegistry.INSTANCE.registerCommands(event.getDispatcher());
- }
-
-}

27
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java.patch Normal file
View File

@@ -0,0 +1,27 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/compat/Vanish.java
+++ /dev/null
@@ -1,24 +1,0 @@
-package com.hypherionmc.craterlib.compat;
-
-import com.hypherionmc.craterlib.api.events.server.CraterPlayerEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import net.neoforged.bus.api.SubscribeEvent;
-import redstonedubstep.mods.vanishmod.api.PlayerVanishEvent;
-
-public class Vanish {
-
- public Vanish() {
-
- }
-
- @SubscribeEvent
- public void vanishevent(PlayerVanishEvent event) {
- if (event.isVanished()) {
- CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedOut(BridgedPlayer.of(event.getEntity())));
- } else {
- CraterEventBus.INSTANCE.postEvent(new CraterPlayerEvent.PlayerLoggedIn(BridgedPlayer.of(event.getEntity())));
- }
- }
-
-}

39
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch Normal file
View File

@@ -0,0 +1,39 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ /dev/null
@@ -1,36 +1,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import com.hypherionmc.craterlib.utils.ChatUtils;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.PlayerChatMessage;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.FilteredText;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
-public class ServerGamePacketListenerImplMixin {
-
- @Shadow
- public ServerPlayer player;
-
- @Inject(
- method = "lambda$handleChat$5",
- at = @At("HEAD"),
- cancellable = true
- )
- private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
- CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
- CraterEventBus.INSTANCE.postEvent(event);
- if (event.wasCancelled())
- ci.cancel();
- }
-
-}

80
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java.patch Normal file
View File

@@ -0,0 +1,80 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/network/CraterNeoForgeNetworkHandler.java
+++ /dev/null
@@ -1,77 +1,0 @@
-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.world.entity.player.BridgedPlayer;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.LogicalSide;
-import net.neoforged.neoforge.network.PacketDistributor;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
-import net.neoforged.neoforge.network.handling.IPayloadHandler;
-
-import java.util.function.Consumer;
-
-/**
- * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
- */
-public class CraterNeoForgeNetworkHandler extends PacketRegistry {
-
- public CraterNeoForgeNetworkHandler(PacketSide side) {
- super(side);
- }
-
- @SubscribeEvent
- 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) {
-
- }
-
- public <T> void sendToServer(T packet) {
- this.sendToServer(packet, false);
- }
-
- public <T> void sendToServer(T packet, boolean ignoreCheck) {
- 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) {
- 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));
- }
- }
- }
-
- private <T, K extends CommonPacketWrapper<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T>> handler) {
- return (payload, ctx) -> {
- try
- {
- PacketSide side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? PacketSide.SERVER : PacketSide.CLIENT;
- 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);
- }
- };
- }
-}

34
patches/1.20/NeoForge/src/main/resources/META-INF/neoforge.mods.toml.patch Normal file
View File

@@ -0,0 +1,34 @@
--- a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml
+++ /dev/null
@@ -1,31 +1,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 = "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
patches/1.20/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform.patch Normal file
View File

@@ -0,0 +1,4 @@
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform
+++ /dev/null
@@ -1,1 +1,0 @@
-com.hypherionmc.craterlib.client.NeoForgeClientHelper

4
patches/1.20/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform.patch Normal file
View File

@@ -0,0 +1,4 @@
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform
+++ /dev/null
@@ -1,1 +1,0 @@
-com.hypherionmc.craterlib.common.NeoForgeCommonHelper

4
patches/1.20/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils.patch Normal file
View File

@@ -0,0 +1,4 @@
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils
+++ /dev/null
@@ -1,1 +1,0 @@
-com.hypherionmc.craterlib.common.NeoForgeCompatHelper

4
patches/1.20/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment.patch Normal file
View File

@@ -0,0 +1,4 @@
--- a/NeoForge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment
+++ /dev/null
@@ -1,1 +1,0 @@
-com.hypherionmc.craterlib.common.NeoForgeLoaderHelper

18
patches/1.20/NeoForge/src/main/resources/craterlib.neoforge.mixins.json.patch Normal file
View File

@@ -0,0 +1,18 @@
--- a/NeoForge/src/main/resources/craterlib.neoforge.mixins.json
+++ /dev/null
@@ -1,15 +1,0 @@
-{
- "required": true,
- "minVersion": "0.8",
- "package": "com.hypherionmc.craterlib.mixin",
- "compatibilityLevel": "JAVA_17",
- "mixins": [
- ],
- "client": [],
- "server": [
- "ServerGamePacketListenerImplMixin"
- ],
- "injectors": {
- "defaultRequire": 1
- }
-}