Port legacy-fabric-networking-api-v1

Legacy-Fabric · Feb 8, 2024 · cd2d50c · cd2d50c
1 parent 6f99227
commit cd2d50c
Show file tree

Hide file tree

Showing 94 changed files with 19 additions and 38 deletions.
diff --git a/1.12.2/legacy-fabric-networking-api-v1/build.gradle b/1.12.2/legacy-fabric-networking-api-v1/build.gradle
diff --git a/1.7.10/legacy-fabric-networking-api-v1/build.gradle b/1.7.10/legacy-fabric-networking-api-v1/build.gradle
diff --git a/1.8.9/legacy-fabric-networking-api-v1/build.gradle b/1.8.9/legacy-fabric-networking-api-v1/build.gradle
diff --git a/common/legacy-fabric-networking-api-v1-common/build.gradle b/common/legacy-fabric-networking-api-v1-common/build.gradle
diff --git a/legacy-fabric-networking-api-v1/1.12.2/build.gradle b/legacy-fabric-networking-api-v1/1.12.2/build.gradle
diff --git a/legacy-fabric-networking-api-v1/1.12.2/gradle.properties b/legacy-fabric-networking-api-v1/1.12.2/gradle.properties
@@ -0,0 +1,2 @@
+minVersionExcluded=1.8.9
+maxVersionIncluded=1.12.2
diff --git a/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java b/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java
diff --git a/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java b/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java
diff --git a/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java b/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java
diff --git a/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java b/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java
diff --git a/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java b/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java
diff --git a/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java b/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java
diff --git a/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png b/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png
diff --git a/...api-v1/src/main/resources/fabric.mod.json → ...1.12.2/src/main/resources/fabric.mod.json b/...api-v1/src/main/resources/fabric.mod.json → ...1.12.2/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "minecraft": "<=1.7.10"
+    "minecraft": "${minecraft_version}"
   },
   "description": "Low-level, vanilla protocol oriented networking hooks.",
   "mixins": [

diff --git a/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json b/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json
diff --git a/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java b/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java
diff --git a/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java b/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java
diff --git a/...-v1/src/testmod/resources/fabric.mod.json → ...2.2/src/testmod/resources/fabric.mod.json b/...-v1/src/testmod/resources/fabric.mod.json → ...2.2/src/testmod/resources/fabric.mod.json
@@ -12,6 +12,6 @@
     ]
   },
   "depends": {
-    "minecraft": ">=1.8 <=1.8.9"
+    "minecraft": "${minecraft_version}"
   }
 }
diff --git a/legacy-fabric-networking-api-v1/1.7.10/build.gradle b/legacy-fabric-networking-api-v1/1.7.10/build.gradle
diff --git a/legacy-fabric-networking-api-v1/1.7.10/gradle.properties b/legacy-fabric-networking-api-v1/1.7.10/gradle.properties
@@ -0,0 +1,2 @@
+minVersionExcluded=1.6.4
+maxVersionIncluded=1.7.10
diff --git a/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java b/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java
diff --git a/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java b/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java
diff --git a/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java b/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java
diff --git a/.../mixin/networking/PacketByteBufMixin.java → .../mixin/networking/PacketByteBufMixin.java b/.../mixin/networking/PacketByteBufMixin.java → .../mixin/networking/PacketByteBufMixin.java
diff --git a/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java b/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java
diff --git a/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java b/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java
diff --git a/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java b/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java
diff --git a/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png b/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png
diff --git a/...api-v1/src/main/resources/fabric.mod.json → ...1.7.10/src/main/resources/fabric.mod.json b/...api-v1/src/main/resources/fabric.mod.json → ...1.7.10/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "minecraft": ">1.8.9 <=1.12.2"
+    "minecraft": "${minecraft_version}"
   },
   "description": "Low-level, vanilla protocol oriented networking hooks.",
   "mixins": [

diff --git a/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json b/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json
diff --git a/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java b/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java
diff --git a/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java b/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java
diff --git a/...-v1/src/testmod/resources/fabric.mod.json → ....10/src/testmod/resources/fabric.mod.json b/...-v1/src/testmod/resources/fabric.mod.json → ....10/src/testmod/resources/fabric.mod.json
@@ -12,6 +12,6 @@
     ]
   },
   "depends": {
-    "minecraft": ">1.8.9 <=1.12.2"
+    "minecraft": "${minecraft_version}"
   }
 }
diff --git a/legacy-fabric-networking-api-v1/1.8.9/build.gradle b/legacy-fabric-networking-api-v1/1.8.9/build.gradle
diff --git a/legacy-fabric-networking-api-v1/1.8.9/gradle.properties b/legacy-fabric-networking-api-v1/1.8.9/gradle.properties
@@ -0,0 +1,2 @@
+minVersionIncluded=1.8
+maxVersionIncluded=1.8.9
diff --git a/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java b/...xin/networking/ClientConnectionMixin.java → ...xin/networking/ClientConnectionMixin.java
diff --git a/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java b/...tworking/CustomPayloadC2SPacketMixin.java → ...tworking/CustomPayloadC2SPacketMixin.java
diff --git a/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java b/...ixin/networking/MinecraftServerMixin.java → ...ixin/networking/MinecraftServerMixin.java
diff --git a/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java b/.../mixin/networking/PlayerManagerMixin.java → .../mixin/networking/PlayerManagerMixin.java
diff --git a/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java b/...g/client/CustomPayloadS2CPacketMixin.java → ...g/client/CustomPayloadS2CPacketMixin.java
diff --git a/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java b/...tworking/client/MinecraftClientMixin.java → ...tworking/client/MinecraftClientMixin.java
diff --git a/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png b/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png
diff --git a/...api-v1/src/main/resources/fabric.mod.json → .../1.8.9/src/main/resources/fabric.mod.json b/...api-v1/src/main/resources/fabric.mod.json → .../1.8.9/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "minecraft": ">=1.8 <=1.8.9"
+    "minecraft": "${minecraft_version}"
   },
   "description": "Low-level, vanilla protocol oriented networking hooks.",
   "mixins": [

diff --git a/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json b/...gacy-fabric-networking-api-v1.mixins.json → ...gacy-fabric-networking-api-v1.mixins.json
diff --git a/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java b/...ic/test/network/ServerNetworkingTest.java → ...ic/test/network/ServerNetworkingTest.java
diff --git a/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java b/.../network/client/ClientNetworkingTest.java → .../network/client/ClientNetworkingTest.java
diff --git a/...-v1/src/testmod/resources/fabric.mod.json → ...8.9/src/testmod/resources/fabric.mod.json b/...-v1/src/testmod/resources/fabric.mod.json → ...8.9/src/testmod/resources/fabric.mod.json
@@ -12,6 +12,6 @@
     ]
   },
   "depends": {
-    "minecraft": "<=1.7.10"
+    "minecraft": "${minecraft_version}"
   }
 }
diff --git a/legacy-fabric-networking-api-v1/common.gradle b/legacy-fabric-networking-api-v1/common.gradle
@@ -0,0 +1,3 @@
+moduleDependencies(project, [
+    "legacy-fabric-api-base"
+])
diff --git a/legacy-fabric-networking-api-v1/common/build.gradle b/legacy-fabric-networking-api-v1/common/build.gradle
diff --git a/legacy-fabric-networking-api-v1/common/gradle.properties b/legacy-fabric-networking-api-v1/common/gradle.properties
@@ -0,0 +1,2 @@
+minVersionExcluded=1.6.4
+maxVersionIncluded=1.12.2
diff --git a/...t/networking/v1/C2SPlayChannelEvents.java → ...t/networking/v1/C2SPlayChannelEvents.java b/...t/networking/v1/C2SPlayChannelEvents.java → ...t/networking/v1/C2SPlayChannelEvents.java
diff --git a/...orking/v1/ClientPlayConnectionEvents.java → ...orking/v1/ClientPlayConnectionEvents.java b/...orking/v1/ClientPlayConnectionEvents.java → ...orking/v1/ClientPlayConnectionEvents.java
diff --git a/...t/networking/v1/ClientPlayNetworking.java → ...t/networking/v1/ClientPlayNetworking.java b/...t/networking/v1/ClientPlayNetworking.java → ...t/networking/v1/ClientPlayNetworking.java
diff --git a/...pi/client/networking/v1/package-info.java → ...pi/client/networking/v1/package-info.java b/...pi/client/networking/v1/package-info.java → ...pi/client/networking/v1/package-info.java
diff --git a/...i/networking/v1/EntityTrackingEvents.java → ...i/networking/v1/EntityTrackingEvents.java b/...i/networking/v1/EntityTrackingEvents.java → ...i/networking/v1/EntityTrackingEvents.java
diff --git a/...ic/api/networking/v1/FutureListeners.java → ...ic/api/networking/v1/FutureListeners.java b/...ic/api/networking/v1/FutureListeners.java → ...ic/api/networking/v1/FutureListeners.java
diff --git a/...ric/api/networking/v1/PacketByteBufs.java → ...ric/api/networking/v1/PacketByteBufs.java b/...ric/api/networking/v1/PacketByteBufs.java → ...ric/api/networking/v1/PacketByteBufs.java
diff --git a/...abric/api/networking/v1/PacketSender.java → ...abric/api/networking/v1/PacketSender.java b/...abric/api/networking/v1/PacketSender.java → ...abric/api/networking/v1/PacketSender.java
diff --git a/...abric/api/networking/v1/PlayerLookup.java → ...abric/api/networking/v1/PlayerLookup.java b/...abric/api/networking/v1/PlayerLookup.java → ...abric/api/networking/v1/PlayerLookup.java
diff --git a/...i/networking/v1/S2CPlayChannelEvents.java → ...i/networking/v1/S2CPlayChannelEvents.java b/...i/networking/v1/S2CPlayChannelEvents.java → ...i/networking/v1/S2CPlayChannelEvents.java
diff --git a/...orking/v1/ServerPlayConnectionEvents.java → ...orking/v1/ServerPlayConnectionEvents.java b/...orking/v1/ServerPlayConnectionEvents.java → ...orking/v1/ServerPlayConnectionEvents.java
diff --git a/...i/networking/v1/ServerPlayNetworking.java → ...i/networking/v1/ServerPlayNetworking.java b/...i/networking/v1/ServerPlayNetworking.java → ...i/networking/v1/ServerPlayNetworking.java
diff --git a/...abric/api/networking/v1/package-info.java → ...abric/api/networking/v1/package-info.java b/...abric/api/networking/v1/package-info.java → ...abric/api/networking/v1/package-info.java
diff --git a/...orking/AbstractChanneledNetworkAddon.java → ...orking/AbstractChanneledNetworkAddon.java b/...orking/AbstractChanneledNetworkAddon.java → ...orking/AbstractChanneledNetworkAddon.java
diff --git a/...impl/networking/AbstractNetworkAddon.java → ...impl/networking/AbstractNetworkAddon.java b/...impl/networking/AbstractNetworkAddon.java → ...impl/networking/AbstractNetworkAddon.java
diff --git a/...ic/impl/networking/ChannelInfoHolder.java → ...ic/impl/networking/ChannelInfoHolder.java b/...ic/impl/networking/ChannelInfoHolder.java → ...ic/impl/networking/ChannelInfoHolder.java
diff --git a/...networking/ClientConnectionExtension.java → ...networking/ClientConnectionExtension.java b/...networking/ClientConnectionExtension.java → ...networking/ClientConnectionExtension.java
diff --git a/...pl/networking/DisconnectPacketSource.java → ...pl/networking/DisconnectPacketSource.java b/...pl/networking/DisconnectPacketSource.java → ...pl/networking/DisconnectPacketSource.java
diff --git a/...pl/networking/GlobalReceiverRegistry.java → ...pl/networking/GlobalReceiverRegistry.java b/...pl/networking/GlobalReceiverRegistry.java → ...pl/networking/GlobalReceiverRegistry.java
diff --git a/...abric/impl/networking/NetworkingImpl.java → ...abric/impl/networking/NetworkingImpl.java b/...abric/impl/networking/NetworkingImpl.java → ...abric/impl/networking/NetworkingImpl.java
diff --git a/...pl/networking/PacketByteBufExtension.java → ...pl/networking/PacketByteBufExtension.java b/...pl/networking/PacketByteBufExtension.java → ...pl/networking/PacketByteBufExtension.java
diff --git a/...pl/networking/PacketCallbackListener.java → ...pl/networking/PacketCallbackListener.java b/...pl/networking/PacketCallbackListener.java → ...pl/networking/PacketCallbackListener.java
diff --git a/...tworking/client/ClientNetworkingImpl.java → ...tworking/client/ClientNetworkingImpl.java b/...tworking/client/ClientNetworkingImpl.java → ...tworking/client/ClientNetworkingImpl.java
diff --git a/...orking/client/ClientPlayNetworkAddon.java → ...orking/client/ClientPlayNetworkAddon.java b/...orking/client/ClientPlayNetworkAddon.java → ...orking/client/ClientPlayNetworkAddon.java
diff --git a/...t/ClientPlayNetworkHandlerExtensions.java → ...t/ClientPlayNetworkHandlerExtensions.java b/...t/ClientPlayNetworkHandlerExtensions.java → ...t/ClientPlayNetworkHandlerExtensions.java
diff --git a/...ient/CustomPayloadS2CPacketExtension.java → ...ient/CustomPayloadS2CPacketExtension.java b/...ient/CustomPayloadS2CPacketExtension.java → ...ient/CustomPayloadS2CPacketExtension.java
diff --git a/...ing/client/MinecraftClientExtensions.java → ...ing/client/MinecraftClientExtensions.java b/...ing/client/MinecraftClientExtensions.java → ...ing/client/MinecraftClientExtensions.java
diff --git a/...rver/CustomPayloadC2SPacketExtension.java → ...rver/CustomPayloadC2SPacketExtension.java b/...rver/CustomPayloadC2SPacketExtension.java → ...rver/CustomPayloadC2SPacketExtension.java
diff --git a/...ing/server/MinecraftServerExtensions.java → ...ing/server/MinecraftServerExtensions.java b/...ing/server/MinecraftServerExtensions.java → ...ing/server/MinecraftServerExtensions.java
diff --git a/...tworking/server/ServerNetworkingImpl.java → ...tworking/server/ServerNetworkingImpl.java b/...tworking/server/ServerNetworkingImpl.java → ...tworking/server/ServerNetworkingImpl.java
diff --git a/...orking/server/ServerPlayNetworkAddon.java → ...orking/server/ServerPlayNetworkAddon.java b/...orking/server/ServerPlayNetworkAddon.java → ...orking/server/ServerPlayNetworkAddon.java
diff --git a/...r/ServerPlayNetworkHandlerExtensions.java → ...r/ServerPlayNetworkHandlerExtensions.java b/...r/ServerPlayNetworkHandlerExtensions.java → ...r/ServerPlayNetworkHandlerExtensions.java
diff --git a/...tworking/CustomPayloadS2CPacketMixin.java → ...tworking/CustomPayloadS2CPacketMixin.java b/...tworking/CustomPayloadS2CPacketMixin.java → ...tworking/CustomPayloadS2CPacketMixin.java
diff --git a/...xin/networking/EntityTrackerAccessor.java → ...xin/networking/EntityTrackerAccessor.java b/...xin/networking/EntityTrackerAccessor.java → ...xin/networking/EntityTrackerAccessor.java
diff --git a/...etworking/EntityTrackerEntryAccessor.java → ...etworking/EntityTrackerEntryAccessor.java b/...etworking/EntityTrackerEntryAccessor.java → ...etworking/EntityTrackerEntryAccessor.java
diff --git a/...n/networking/EntityTrackerEntryMixin.java → ...n/networking/EntityTrackerEntryMixin.java b/...n/networking/EntityTrackerEntryMixin.java → ...n/networking/EntityTrackerEntryMixin.java
diff --git a/...orking/ServerPlayNetworkHandlerMixin.java → ...orking/ServerPlayNetworkHandlerMixin.java b/...orking/ServerPlayNetworkHandlerMixin.java → ...orking/ServerPlayNetworkHandlerMixin.java
diff --git a/...client/ClientPlayNetworkHandlerMixin.java → ...client/ClientPlayNetworkHandlerMixin.java b/...client/ClientPlayNetworkHandlerMixin.java → ...client/ClientPlayNetworkHandlerMixin.java
diff --git a/...working/client/ConnectScreenAccessor.java → ...working/client/ConnectScreenAccessor.java b/...working/client/ConnectScreenAccessor.java → ...working/client/ConnectScreenAccessor.java
diff --git a/...rking/client/MinecraftClientAccessor.java → ...rking/client/MinecraftClientAccessor.java b/...rking/client/MinecraftClientAccessor.java → ...rking/client/MinecraftClientAccessor.java
diff --git a/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png b/...n/resources/assets/legacy-fabric/icon.png → ...n/resources/assets/legacy-fabric/icon.png
diff --git a/...common/src/main/resources/fabric.mod.json → ...common/src/main/resources/fabric.mod.json b/...common/src/main/resources/fabric.mod.json → ...common/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "minecraft": ">1.6.4 <=1.12.2"
+    "minecraft": "${minecraft_version}"
   },
   "description": "Low-level, vanilla protocol oriented networking hooks.",
   "mixins": [

diff --git a/...bric-networking-api-v1-common.mixins.json → ...bric-networking-api-v1-common.mixins.json b/...bric-networking-api-v1-common.mixins.json → ...bric-networking-api-v1-common.mixins.json
diff --git a/settings.gradle b/settings.gradle
@@ -34,6 +34,7 @@ loadProject("legacy-fabric-entity-events-v1")
 loadProject("legacy-fabric-gamerule-api-v1")
 loadProject("legacy-fabric-item-groups-v1")
 loadProject("legacy-fabric-keybindings-api-v1")
+loadProject("legacy-fabric-networking-api-v1")
 
 //include("common")
 //include("common:legacy-fabric-logger-api-v1")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minVersionExcluded=1.8.9
		maxVersionIncluded=1.12.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minVersionExcluded=1.6.4
		maxVersionIncluded=1.7.10
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minVersionIncluded=1.8
		maxVersionIncluded=1.8.9