From 2a546955a433c7a2dbc930b57670de6d27b6c4df Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Tue, 31 Oct 2017 18:22:55 +0000 Subject: [PATCH] Clean up more deprecated library functions (#4283) --- .../client/LoadingScreenRenderer.java.patch | 2 +- .../net/minecraft/command/CommandHandler.java.patch | 2 +- .../net/minecraft/world/biome/Biome.java.patch | 12 +++++------- .../fml/common/asm/transformers/SideTransformer.java | 3 ++- .../asm/transformers/deobf/FMLRemappingAdapter.java | 6 ++++-- .../network/FMLIndexedMessageToMessageCodec.java | 8 +++----- .../network/handshake/HandshakeMessageHandler.java | 4 +--- .../network/internal/HandshakeCompletionHandler.java | 2 +- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch index ab853bf67f..25b99e7234 100644 --- a/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch @@ -19,7 +19,7 @@ + } + catch (java.io.IOException e) + { -+ com.google.common.base.Throwables.propagate(e); ++ throw new RuntimeException(e); + } //FML End this.field_146588_g.func_147609_e(); diff --git a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch index 79fda6af5a..de6db71b37 100644 --- a/patches/minecraft/net/minecraft/command/CommandHandler.java.patch +++ b/patches/minecraft/net/minecraft/command/CommandHandler.java.patch @@ -9,7 +9,7 @@ + { + if (event.getException() != null) + { -+ com.google.common.base.Throwables.propagateIfPossible(event.getException()); ++ com.google.common.base.Throwables.throwIfUnchecked(event.getException()); + } + return 1; + } diff --git a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch index 376e057895..1f9850b39b 100644 --- a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch @@ -168,25 +168,23 @@ public Class field_76300_b; public int field_76301_c; public int field_76299_d; -+ private final java.lang.reflect.Constructor ctr; ++ private final java.lang.reflect.Constructor ctr; public SpawnListEntry(Class p_i1970_1_, int p_i1970_2_, int p_i1970_3_, int p_i1970_4_) { -@@ -559,12 +643,28 @@ +@@ -559,12 +643,26 @@ this.field_76300_b = p_i1970_1_; this.field_76301_c = p_i1970_3_; this.field_76299_d = p_i1970_4_; + -+ java.lang.reflect.Constructor tmp = null; + try + { -+ tmp = p_i1970_1_.getConstructor(World.class); ++ ctr = p_i1970_1_.getConstructor(World.class); + } + catch (NoSuchMethodException e) + { -+ com.google.common.base.Throwables.propagate(e); ++ throw new RuntimeException(e); + } -+ ctr = tmp; } public String toString() @@ -196,7 +194,7 @@ + + public EntityLiving newInstance(World world) throws Exception + { -+ return (EntityLiving)ctr.newInstance(world); ++ return ctr.newInstance(world); + } } diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java index 4c1d0b5731..9911c4cd06 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java @@ -154,7 +154,8 @@ public class SideTransformer implements IClassTransformer private static class LambdaGatherer extends MethodVisitor { private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", - "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;"); + "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", + false); private final List dynamicLambdaHandles = new ArrayList(); public LambdaGatherer() { diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java index dccd896dbd..d6d5749294 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java @@ -40,9 +40,11 @@ public class FMLRemappingAdapter extends RemappingClassAdapter { private static final List META_FACTORIES = Arrays.asList( new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", - "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;"), + "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", + false), new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "altMetafactory", - "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;") + "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;", + false) ); @Override diff --git a/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java b/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java index db24c2ba79..1318f8f31a 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java +++ b/src/main/java/net/minecraftforge/fml/common/network/FMLIndexedMessageToMessageCodec.java @@ -35,8 +35,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; -import org.apache.logging.log4j.Level; - @Sharable public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessageCodec { private TByteObjectHashMap> discriminators = new TByteObjectHashMap>(); @@ -52,7 +50,7 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag public void handlerAdded(ChannelHandlerContext ctx) throws Exception { super.handlerAdded(ctx); - ctx.attr(INBOUNDPACKETTRACKER).set(new ThreadLocal>()); + ctx.channel().attr(INBOUNDPACKETTRACKER).set(new ThreadLocal>()); } public FMLIndexedMessageToMessageCodec addDiscriminator(int discriminator, Class type) @@ -72,7 +70,7 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag buffer.writeByte(discriminator); encodeInto(ctx, msg, buffer); FMLProxyPacket proxy = new FMLProxyPacket(buffer/*.copy()*/, ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); - WeakReference ref = ctx.attr(INBOUNDPACKETTRACKER).get().get(); + WeakReference ref = ctx.channel().attr(INBOUNDPACKETTRACKER).get().get(); FMLProxyPacket old = ref == null ? null : ref.get(); if (old != null) { @@ -99,7 +97,7 @@ public abstract class FMLIndexedMessageToMessageCodec extends MessageToMessag throw new NullPointerException("Undefined message for discriminator " + discriminator + " in channel " + msg.channel()); } A newMsg = clazz.newInstance(); - ctx.attr(INBOUNDPACKETTRACKER).get().set(new WeakReference(msg)); + ctx.channel().attr(INBOUNDPACKETTRACKER).get().set(new WeakReference(msg)); decodeInto(ctx, payload.slice(), newMsg); out.add(newMsg); } diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java index 0cded94a62..5d547bd309 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/HandshakeMessageHandler.java @@ -21,8 +21,6 @@ package net.minecraftforge.fml.common.network.handshake; import net.minecraftforge.fml.common.FMLLog; -import org.apache.logging.log4j.Level; - import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.AttributeKey; @@ -60,7 +58,7 @@ public class HandshakeMessageHandler & IHandshakeState> ext @Override public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception { - S state = ctx.attr(fmlHandshakeState).get(); + S state = ctx.channel().attr(fmlHandshakeState).get(); FMLLog.log.debug("{}: null->{}:{}", stateType.getSimpleName(), state.getClass().getName().substring(state.getClass().getName().lastIndexOf('.')+1), state); state.accept(ctx, null, s -> { diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java b/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java index 04157fc0c2..b9bef9e7ca 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/internal/HandshakeCompletionHandler.java @@ -32,7 +32,7 @@ public class HandshakeCompletionHandler extends SimpleChannelInboundHandler