From 2d572f674060e0f3d224d030f5ba35056b48bf87 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Wed, 24 Apr 2019 18:33:03 +0200 Subject: [PATCH] Get restrictions module "compiling" on 1.13 --- .../restrictions/ReplayModRestrictions.java | 198 +++++++++--------- versions/common.gradle | 7 - 2 files changed, 102 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java b/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java index 4b4fb54e..de3d0b84 100644 --- a/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java +++ b/src/main/java/com/replaymod/restrictions/ReplayModRestrictions.java @@ -1,28 +1,33 @@ -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; +// 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<11300 +//$$ 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; +//$$ 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; @@ -38,81 +43,82 @@ import net.minecraftforge.fml.relauncher.Side; //$$ 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 = "*", +//$$ +//$$ 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, + //$$ 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) { +//$$ 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); - } -} +//$$ 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/versions/common.gradle b/versions/common.gradle index cc43fc55..dc8f061a 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -279,13 +279,6 @@ if (project.name != 'core') { minecraft.accessTransformers << file('../../src/main/resources/META-INF/replaymod_at.cfg') } } -sourceSets { - main { - java { - exclude 'com/replaymod/restrictions' - } - } -} task configureRelocation() { dependsOn tasks.jar