From 9a67a6455525e38ebda7257237c16af77cfeaf77 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 19 Feb 2021 23:15:39 +0100 Subject: [PATCH] Drop server-side restrictions implementation I don't think this sees sufficient use to justify updating. Especially because it's non-trivial with forge's network changes. Ping me if you actually used this. --- .../restrictions/ReplayModRestrictions.java | 124 ------------------ .../com/replaymod/restrictions/Setting.java | 19 --- src/main/resources/mcmod.info | 16 --- 3 files changed, 159 deletions(-) delete mode 100644 src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java delete mode 100644 src/main/java/com/replaymod/restrictions/Setting.java diff --git a/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java b/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java deleted file mode 100644 index d05741ac..00000000 --- a/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java +++ /dev/null @@ -1,124 +0,0 @@ -// I don't think this sees sufficient use to justify updating. -// Especially because it's non-trivial with forge's network changes. -// PRs welcome. Ping me if you actually used this. - -//#if MC<11400 -//$$ package com.replaymod.restrictions; -//$$ -//$$ import com.replaymod.core.SettingsRegistry; -//$$ import com.replaymod.core.utils.Restrictions; -//$$ import io.netty.buffer.Unpooled; -//$$ import io.netty.channel.ChannelDuplexHandler; -//$$ import io.netty.channel.ChannelFutureListener; -//$$ import io.netty.channel.ChannelHandler; -//$$ import net.minecraft.network.PacketBuffer; -//$$ import net.minecraftforge.common.config.Configuration; -//$$ import org.apache.logging.log4j.Logger; -//$$ -//#if MC>=10800 -//$$ import net.minecraftforge.fml.common.Mod; -//$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent; -//$$ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -//$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -//$$ import net.minecraftforge.fml.common.eventhandler.EventBus; -//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -//$$ import net.minecraftforge.fml.common.gameevent.PlayerEvent; -//$$ import net.minecraftforge.fml.common.network.FMLEmbeddedChannel; -//$$ import net.minecraftforge.fml.common.network.FMLOutboundHandler; -//$$ import net.minecraftforge.fml.common.network.NetworkRegistry; -//$$ import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; -//$$ import net.minecraftforge.fml.relauncher.Side; -//#else -//$$ import cpw.mods.fml.common.FMLCommonHandler; -//$$ import cpw.mods.fml.common.Mod; -//$$ import cpw.mods.fml.common.event.FMLInitializationEvent; -//$$ import cpw.mods.fml.common.event.FMLPostInitializationEvent; -//$$ import cpw.mods.fml.common.event.FMLPreInitializationEvent; -//$$ import cpw.mods.fml.common.eventhandler.EventBus; -//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent; -//$$ import cpw.mods.fml.common.gameevent.PlayerEvent; -//$$ import cpw.mods.fml.common.network.FMLEmbeddedChannel; -//$$ import cpw.mods.fml.common.network.FMLOutboundHandler; -//$$ import cpw.mods.fml.common.network.NetworkRegistry; -//$$ import cpw.mods.fml.common.network.internal.FMLProxyPacket; -//$$ import cpw.mods.fml.relauncher.Side; -//#endif -//$$ -//$$ import java.io.IOException; -//$$ import java.util.HashMap; -//$$ import java.util.Map; -//$$ -//$$ import static com.replaymod.core.versions.MCVer.*; -//$$ -//$$ @Mod(modid = ReplayModRestrictions.MOD_ID, -//$$ version = "@MOD_VERSION@", -//$$ acceptedMinecraftVersions = "@MC_VERSION@", -//$$ acceptableRemoteVersions = "*", - //#if MC>=10800 - //$$ serverSideOnly = true, - //#endif -//$$ useMetadata = true) -//$$ public class ReplayModRestrictions { -//$$ public static final String MOD_ID = "replaymod-restrictions"; -//$$ -//$$ public static Logger LOGGER; -//$$ -//$$ private final SettingsRegistry settingsRegistry = new SettingsRegistry(); -//$$ private FMLEmbeddedChannel channel; -//$$ -//$$ @Mod.EventHandler -//$$ public void preInit(FMLPreInitializationEvent event) { -//$$ LOGGER = event.getModLog(); -//$$ -//$$ Configuration config = new Configuration(event.getSuggestedConfigurationFile()); -//$$ config.load(); -//$$ settingsRegistry.setConfiguration(config); -//$$ -//$$ settingsRegistry.register(Setting.class); -//$$ } -//$$ -//$$ @Mod.EventHandler -//$$ public void init(FMLInitializationEvent event) { - //#if MC<=10710 - //$$ if (FMLCommonHandler.instance().getSide() == Side.CLIENT) return; - //#endif -//$$ EventBus bus = FML_BUS; -//$$ bus.register(this); -//$$ -//$$ channel = NetworkRegistry.INSTANCE.newChannel(Restrictions.PLUGIN_CHANNEL, new RestrictionsChannelHandler()).get(Side.SERVER); -//$$ } -//$$ -//$$ @Mod.EventHandler -//$$ public void postInit(FMLPostInitializationEvent event) throws IOException { -//$$ settingsRegistry.save(); // Save default values to disk -//$$ } -//$$ -//$$ @ChannelHandler.Sharable -//$$ private static class RestrictionsChannelHandler extends ChannelDuplexHandler {} -//$$ -//$$ @SubscribeEvent -//$$ public void onUserJoin(PlayerEvent.PlayerLoggedInEvent event) { -//$$ Map restrictions = new HashMap<>(); -//$$ if (settingsRegistry.get(Setting.NO_XRAY)) restrictions.put("no_xray", new byte[0]); -//$$ if (settingsRegistry.get(Setting.NO_NOCLIP)) restrictions.put("no_noclip", new byte[0]); -//$$ if (settingsRegistry.get(Setting.ONLY_FIRST_PERSON)) restrictions.put("only_first_person", new byte[0]); -//$$ if (settingsRegistry.get(Setting.ONLY_RECORDING_PLAYER)) restrictions.put("only_recording_player", new byte[0]); -//$$ if (settingsRegistry.get(Setting.HIDE_COORDINATES)) restrictions.put("hide_coordinates", new byte[0]); -//$$ -//$$ PacketBuffer buf = new PacketBuffer(Unpooled.buffer()); -//$$ for (Map.Entry e : restrictions.entrySet()) { -//$$ byte[] bytes = e.getKey().getBytes(); -//$$ buf.writeByte(bytes.length); -//$$ buf.writeBytes(bytes); -//$$ buf.writeByte(1); -//$$ buf.writeBytes(e.getValue()); -//$$ } -//$$ -//$$ FMLProxyPacket packet = new FMLProxyPacket(buf, Restrictions.PLUGIN_CHANNEL); -//$$ -//$$ channel.attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); -//$$ channel.attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(event.player); -//$$ channel.writeAndFlush(packet).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); -//$$ } -//$$ } -//#endif diff --git a/src/main/java/com/replaymod/restrictions/Setting.java b/src/main/java/com/replaymod/restrictions/Setting.java deleted file mode 100644 index 7a36e936..00000000 --- a/src/main/java/com/replaymod/restrictions/Setting.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.replaymod.restrictions; - -import com.replaymod.core.SettingsRegistry; - -public final class Setting extends SettingsRegistry.SettingKeys { - public static final Setting NO_XRAY = make("no_xray", false); - public static final Setting NO_NOCLIP = make("no_noclip", false); - public static final Setting ONLY_FIRST_PERSON = make("only_first_person", false); - public static final Setting ONLY_RECORDING_PLAYER = make("only_recording_player", false); - public static final Setting HIDE_COORDINATES = make("hide_coordinates", false); - - private static Setting make(String key, T defaultValue) { - return new Setting<>("restrictions", key, defaultValue); - } - - public Setting(String category, String key, T defaultValue) { - super(category, key, null, defaultValue); - } -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3432d978..4c7f1a50 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -117,22 +117,6 @@ "screenshots": [], "dependencies": [] }, - { - "modid": "replaymod-restrictions", - "name": "Replay Mod - Restrictions", - "description": "Server-side Restrictions Module of the ReplayMod - Restrict what clients can do in replays", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://replaymod.com", - "updateUrl": "https://replaymod.com/download", - "authorList": [ - "CrushedPixel", - "johni0702" - ], - "logoFile": "replaymod_logo.png", - "screenshots": [], - "dependencies": [] - }, { "modid": "replaymod-compat", "name": "Replay Mod - Compatibility",