Patch entity networking #37

UpcraftLP · 2018-08-31T16:44:07Z

adds custom spawn packets for entities and allows modders to alter those
adds a grenade to the test mod for testing said packets
adds utility methods for reflection
allow for overriding vanilla behaviour and fix incorrect tracking behaviour for entities that inherit from registered vanilla entities (as @InsomniaKitten suggested)

ChloeDawn · 2018-10-07T22:30:29Z

build.gradle

-    maven { url 'https://libraries.minecraft.net/' }
-    maven { url 'https://www.dimdev.org/maven/' }
-    maven { url = 'https://repo.spongepowered.org/maven/' }
+    maven {


Redundant formatting change

ChloeDawn · 2018-10-07T22:30:57Z

build.gradle

    debug {
-        compileClasspath += main.compileClasspath
+        compileClasspath += main.compileClasspath + main.output


ChloeDawn · 2018-10-07T22:31:28Z

src/main/java/org/dimdev/rift/mixin/hook/client/MixinNetHandlerPlayClient.java

-    @Shadow @Final private ClientSuggestionProvider clientSuggestionProvider;
-    @Shadow private NetworkTagManager networkTagManager;
-    @Shadow private NBTQueryManager nbtQueryManager;
+    @Shadow


Redundant formatting change

ChloeDawn · 2018-10-07T22:31:44Z

src/main/java/org/dimdev/rift/mixin/hook/client/MixinNetHandlerPlayClient.java

-        for (CustomPayloadHandler customPayloadHandler : RiftLoader.instance.getListeners(CustomPayloadHandler.class)) {
-            if (customPayloadHandler.clientHandlesChannel(channelName)) {
+        for(CustomPayloadHandler customPayloadHandler : RiftLoader.instance.getListeners(CustomPayloadHandler.class)) {
+            if(customPayloadHandler.clientHandlesChannel(channelName)) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:31:50Z

src/main/java/org/dimdev/rift/mixin/hook/client/MixinNetHandlerPlayClient.java

                customPayloadHandler.clientHandleCustomPayload(channelName, data);
            }
        }

        Class<? extends Message> messageClass = Message.REGISTRY.get(channelName);
-        if (messageClass != null) {
+        if(messageClass != null) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:32:02Z

src/main/java/org/dimdev/rift/mixin/hook/client/MixinNetHandlerPlayClient.java

@@ -81,13 +96,13 @@ private void handleModCustomPayload(SPacketCustomPayload packet, CallbackInfo ci
    @Inject(method = "handleUpdateTileEntity", at = @At("RETURN"))
    private void handleUpdateModTileEntity(SPacketUpdateTileEntity packet, CallbackInfo ci) {
        TileEntity tileEntity = world.getTileEntity(packet.getPos());
-        if (tileEntity == null || packet.getNbtCompound() == null || !packet.getNbtCompound().hasKey("id", 8)) {
+        if(tileEntity == null || packet.getNbtCompound() == null || !packet.getNbtCompound().hasKey("id", 8)) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:32:24Z

src/main/java/org/dimdev/utils/ReflectionUtils.java

@@ -15,7 +18,7 @@
            Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
            method.setAccessible(true);
            addURLHandle = MethodHandles.lookup().unreflect(method);
-        } catch (ReflectiveOperationException e) {
+        } catch(ReflectiveOperationException e) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:32:29Z

src/main/java/org/dimdev/utils/ReflectionUtils.java

@@ -27,16 +30,47 @@

            //noinspection unchecked
            return (T) MethodHandles.lookup().unreflectConstructor(constructor).invokeWithArguments(constructorArgs);
-        } catch (Throwable t) {
+        } catch(Throwable t) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:32:35Z

src/main/java/org/dimdev/utils/ReflectionUtils.java

            throw t instanceof RuntimeException ? (RuntimeException) t : new RuntimeException(t);
        }
    }

    public static void addURLToClasspath(URL url) {
        try {
            addURLHandle.invoke(ClassLoader.getSystemClassLoader(), url);
-        } catch (Throwable t) {
+        } catch(Throwable t) {


Redundant formatting change

ChloeDawn · 2018-10-07T22:33:16Z

src/main/resources/mixins.rift.hooks.json

@@ -6,39 +6,41 @@
  "package": "org.dimdev.rift.mixin.hook",
  "refmap": "mixins.rift.refmap.json",
  "mixins": [
+    "MixinAnvilSaveHandler",


These do not need resorting entirely, new mixins can just be appended

UpcraftLP added 8 commits August 31, 2018 01:04

sorted mixins file

64b6797

added maven names

e976be3

fix testmod sourceset

355f08b

added logger getter

96db3d2

bootstrap init

b28fbb5

more reflection utils

a1c657a

added custom entity spawn packets

1fb957d

add test item for spawn packets

973b25e

UpcraftLP mentioned this pull request Aug 31, 2018

[DO NOT MERGE YET] fix testmod compile errors #35

Open

UpcraftLP added 2 commits September 2, 2018 02:30

add test case for overriding vanilla tracking behaviour

25e254c

fix tracking entities that extend vanilla entities

d27a574

ChloeDawn suggested changes Oct 7, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Patch entity networking #37

Patch entity networking #37

UpcraftLP commented Aug 31, 2018 •

edited

Loading

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

ChloeDawn Oct 7, 2018

Patch entity networking #37

Are you sure you want to change the base?

Patch entity networking #37

Conversation

UpcraftLP commented Aug 31, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

UpcraftLP commented Aug 31, 2018 •

edited

Loading