keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Expose the registrationchange event to simple channel (not that anyone should care, but who knows?)

Browse source 
Also, Context.getNetworkManager should have been public. Derp.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-10-18 09:32:44 -04:00
parent 51d08ad8ab
commit c8967fa176
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraftforge/fml/network/NetworkEvent.java
View file

@ -232,7 +232,7 @@ public class NetworkEvent extends Event
return null;
}
NetworkManager getNetworkManager() {
public NetworkManager getNetworkManager() {
return networkManager;
}
}

23
src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java
View file

@ -24,31 +24,42 @@ import net.minecraft.client.Minecraft;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.IPacket;
import net.minecraft.network.PacketBuffer;
import net.minecraft.world.dimension.DimensionType;
import net.minecraftforge.fml.network.*;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.IntSupplier;
import java.util.function.Supplier;
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public class SimpleChannel
{
private final NetworkInstance instance;
private final IndexedMessageCodec indexedCodec;
private final Optional<Consumer<NetworkEvent.ChannelRegistrationChangeEvent>> registryChangeConsumer;
private List<Function<Boolean, ? extends List<? extends Pair<String,?>>>> loginPackets;
public SimpleChannel(NetworkInstance instance)
{
public SimpleChannel(NetworkInstance instance) {
this(instance, Optional.empty());
}
private SimpleChannel(NetworkInstance instance, Optional<Consumer<NetworkEvent.ChannelRegistrationChangeEvent>> registryChangeNotify) {
this.instance = instance;
this.indexedCodec = new IndexedMessageCodec();
this.loginPackets = new ArrayList<>();
instance.addListener(this::networkEventListener);
instance.addGatherListener(this::networkLoginGather);
this.registryChangeConsumer = registryChangeNotify;
}
public SimpleChannel(NetworkInstance instance, Consumer<NetworkEvent.ChannelRegistrationChangeEvent> registryChangeNotify) {
this(instance, Optional.of(registryChangeNotify));
}
private void networkLoginGather(final NetworkEvent.GatherLoginPayloadsEvent gatherEvent) {
@ -62,7 +73,11 @@ public class SimpleChannel
}
private void networkEventListener(final NetworkEvent networkEvent)
{
this.indexedCodec.consume(networkEvent.getPayload(), networkEvent.getLoginIndex(), networkEvent.getSource());
if (networkEvent instanceof NetworkEvent.ChannelRegistrationChangeEvent) {
this.registryChangeConsumer.ifPresent(l->l.accept(((NetworkEvent.ChannelRegistrationChangeEvent) networkEvent)));
} else {
this.indexedCodec.consume(networkEvent.getPayload(), networkEvent.getLoginIndex(), networkEvent.getSource());
}
}
public <MSG> int encodeMessage(MSG message, final PacketBuffer target) {