Skip to content

Commit bd364c6

Browse files
derklaroderklaro
committed
feat: add support for 1.13.2
1 parent b730727 commit bd364c6

15 files changed

+717
-0
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
fail-fast: true
2727
matrix:
2828
mc_version:
29+
- 1.13.2
2930
- 1.14.4
3031
- 1.15
3132
- 1.16.2

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ specific minecraft versions.
1818

1919
| Minecraft Version | Subproject | Supported |
2020
|------------------------|------------|--------------------|
21+
| 1.13.2 | v1_13_2 | :white_check_mark: |
2122
| 1.14.4 | v1_14_4 | :white_check_mark: |
2223
| 1.15, 1.15.1, 1.15.2 | v1_15 | :white_check_mark: |
2324
| 1.16.2 - 1.16.5 | v1_16_2 | :white_check_mark: |

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ plugins {
2424
alias(libs.plugins.spotless)
2525
alias(libs.plugins.shadow) apply false
2626
alias(libs.plugins.fabricLoom) apply false
27+
alias(libs.plugins.legacyLoom) apply false
2728
}
2829

2930
val targetJavaVersion = JavaVersion.VERSION_24

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
shadow = "9.0.2"
55
spotless = "7.2.1"
66
fabricLoom = "1.11.7"
7+
legacyLoom = "1.11.3"
78

89
# libs
910
annotations = "26.0.2"
@@ -24,5 +25,6 @@ cloudnetWrapper = { group = "eu.cloudnetservice.cloudnet", name = "wrapper-jvm-a
2425
[plugins]
2526

2627
fabricLoom = { id = "fabric-loom", version.ref = "fabricLoom" }
28+
legacyLoom = { id = "legacy-looming", version.ref = "legacyLoom" }
2729
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
2830
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

‎settings.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@ pluginManagement {
2323
name = "Fabric"
2424
url = uri("https://maven.fabricmc.net/")
2525
}
26+
maven {
27+
name = "Legacy-Fabric"
28+
url = uri("https://maven.legacyfabric.net/")
29+
}
2630
}
2731
}
2832

2933
rootProject.name = "cloudnet-bridge-fabric"
3034

3135
include(":common")
36+
include(":v1_13_2")
3237
include(":v1_14_4")
3338
include(":v1_15")
3439
include(":v1_16_2")

‎v1_13_2/build.gradle.kts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright 2025-present CloudNetService team & contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import org.apache.tools.ant.filters.ReplaceTokens
18+
19+
plugins {
20+
alias(libs.plugins.fabricLoom)
21+
alias(libs.plugins.legacyLoom)
22+
}
23+
24+
val minecraftVersion = "1.13.2"
25+
val yarnVersion = "1.13.2+build.571"
26+
val supportedVersionRange = "1.13.2"
27+
28+
dependencies {
29+
shaded(projects.common)
30+
modImplementation(libs.fabricLoader)
31+
minecraft("com.mojang:minecraft:$minecraftVersion")
32+
mappings("net.legacyfabric:yarn:$yarnVersion:v2")
33+
}
34+
35+
loom {
36+
accessWidenerPath = project.file("src/main/resources/cloudnet_version_bridge.accesswidener")
37+
}
38+
39+
tasks.remapJar {
40+
dependsOn(tasks.shadowJar)
41+
inputFile = tasks.shadowJar.flatMap { it.archiveFile }
42+
archiveFileName = "bridge_${minecraftVersion.replace(".", "")}.jar"
43+
}
44+
45+
tasks.processResources {
46+
val tokens = mapOf(
47+
"mc_version" to minecraftVersion,
48+
"mc_version_range" to supportedVersionRange,
49+
"mc_version_dashed" to minecraftVersion.replace('.', '_'),
50+
)
51+
inputs.properties(tokens)
52+
filesMatching("*.json") {
53+
filter(ReplaceTokens::class, mapOf("tokens" to tokens))
54+
}
55+
56+
from(rootProject.layout.projectDirectory.dir(".mod_resources")) {
57+
into("")
58+
include("*.json")
59+
}
60+
}

‎v1_13_2/src/main/java/eu/cloudnetservice/modules/bridge/fabric/v1_13_2/FabricBridgeManagementv1132.java‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/*
2+
* Copyright 2025-present CloudNetService team & contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package eu.cloudnetservice.modules.bridge.fabric.v1_13_2;
18+
19+
import eu.cloudnetservice.driver.service.ServiceInfoSnapshot;
20+
import eu.cloudnetservice.modules.bridge.fabric.BaseFabricBridgeManagement;
21+
import eu.cloudnetservice.modules.bridge.fabric.BridgeAccessorSpec;
22+
import eu.cloudnetservice.modules.bridge.impl.util.BridgeHostAndPortUtil;
23+
import eu.cloudnetservice.modules.bridge.player.NetworkPlayerServerInfo;
24+
import eu.cloudnetservice.modules.bridge.player.ServicePlayer;
25+
import eu.cloudnetservice.modules.bridge.player.executor.PlayerExecutor;
26+
import java.util.Optional;
27+
import java.util.UUID;
28+
import java.util.function.BiFunction;
29+
import net.minecraft.entity.player.ServerPlayerEntity;
30+
import org.jetbrains.annotations.NotNull;
31+
import org.jetbrains.annotations.Nullable;
32+
33+
public final class FabricBridgeManagementv1132 extends BaseFabricBridgeManagement<ServerPlayerEntity> {
34+
35+
/**
36+
* Constructs a new instance of the bridge management.
37+
*
38+
* @param bridgeAccessorSpec the accessor specification for the current server version.
39+
* @throws NullPointerException if the given accessor spec is null.
40+
*/
41+
public FabricBridgeManagementv1132(@NotNull BridgeAccessorSpec<ServerPlayerEntity> bridgeAccessorSpec) {
42+
super(bridgeAccessorSpec);
43+
}
44+
45+
/**
46+
* {@inheritDoc}
47+
*/
48+
@Override
49+
public @NotNull ServicePlayer wrapPlayer(@NotNull ServerPlayerEntity player) {
50+
return new ServicePlayer(player.getUuid(), player.getGameProfile().getName());
51+
}
52+
53+
/**
54+
* {@inheritDoc}
55+
*/
56+
@Override
57+
public @NotNull NetworkPlayerServerInfo createPlayerInformation(@NotNull ServerPlayerEntity player) {
58+
return new NetworkPlayerServerInfo(
59+
player.getUuid(),
60+
player.getGameProfile().getName(),
61+
null,
62+
BridgeHostAndPortUtil.fromSocketAddress(player.networkHandler.getConnection().getAddress()),
63+
this.ownNetworkServiceInfo);
64+
}
65+
66+
/**
67+
* {@inheritDoc}
68+
*/
69+
@Override
70+
public @NotNull BiFunction<ServerPlayerEntity, String, Boolean> permissionFunction() {
71+
return (player, _) -> player.method_15592(4);
72+
}
73+
74+
/**
75+
* {@inheritDoc}
76+
*/
77+
@Override
78+
public @NotNull Optional<ServiceInfoSnapshot> fallback(
79+
@NotNull ServerPlayerEntity player,
80+
@Nullable String currServer
81+
) {
82+
return this.fallback(player.getUuid(), currServer, null, _ -> player.method_15592(4));
83+
}
84+
85+
/**
86+
* {@inheritDoc}
87+
*/
88+
@Override
89+
public void handleFallbackConnectionSuccess(@NotNull ServerPlayerEntity player) {
90+
this.handleFallbackConnectionSuccess(player.getUuid());
91+
}
92+
93+
/**
94+
* {@inheritDoc}
95+
*/
96+
@Override
97+
public void removeFallbackProfile(@NotNull ServerPlayerEntity player) {
98+
this.removeFallbackProfile(player.getUuid());
99+
}
100+
101+
/**
102+
* {@inheritDoc}
103+
*/
104+
@Override
105+
public @NotNull PlayerExecutor directPlayerExecutor(@NotNull UUID uniqueId) {
106+
throw new UnsupportedOperationException("not implemented on fabric");
107+
}
108+
}

‎v1_13_2/src/main/java/eu/cloudnetservice/modules/bridge/fabric/v1_13_2/forward/ForwardMixinPlugin.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright 2025-present CloudNetService team & contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package eu.cloudnetservice.modules.bridge.fabric.v1_13_2.forward;
18+
19+
import eu.cloudnetservice.modules.bridge.fabric.BaseMixinConfigPlugin;
20+
import org.jetbrains.annotations.NotNull;
21+
22+
/**
23+
* Mixin plugin to conditionally apply forwarding mixins only if they are actually needed.
24+
*
25+
* @since 2025.08.26
26+
*/
27+
public final class ForwardMixinPlugin extends BaseMixinConfigPlugin {
28+
29+
/**
30+
* If cloudnet ip forwarding support is disabled.
31+
*/
32+
private static final boolean DISABLE_CLOUDNET_FORWARDING = Boolean.getBoolean("cloudnet.ipforward.disabled");
33+
34+
/**
35+
* Conditionally applies the player forwarding mixins if they are enabled.
36+
*
37+
* @param targetClassName fully qualified class name of the target class
38+
* @param mixinClassName fully qualified class name of the mixin
39+
* @return true if the given mixin class should be applied, false otherwise.
40+
*/
41+
@Override
42+
public boolean shouldApplyMixin(@NotNull String targetClassName, @NotNull String mixinClassName) {
43+
var isForwardMixin = mixinClassName.contains(".forward.");
44+
return !isForwardMixin || !DISABLE_CLOUDNET_FORWARDING;
45+
}
46+
}

‎v1_13_2/src/main/java/eu/cloudnetservice/modules/bridge/fabric/v1_13_2/forward/ForwardingDataAccumulator.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* Copyright 2025-present CloudNetService team & contributors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package eu.cloudnetservice.modules.bridge.fabric.v1_13_2.forward;
18+
19+
import com.mojang.authlib.GameProfile;
20+
import com.mojang.authlib.properties.Property;
21+
import io.netty.util.AttributeKey;
22+
import java.util.ArrayList;
23+
import java.util.List;
24+
import java.util.UUID;
25+
import org.jetbrains.annotations.NotNull;
26+
27+
/**
28+
* Accumulator for forwarded player data.
29+
*
30+
* @since 2025.08.26
31+
*/
32+
public final class ForwardingDataAccumulator {
33+
34+
/**
35+
* Key to get the forward data accumulator from a netty channel.
36+
*/
37+
public static final AttributeKey<ForwardingDataAccumulator> ACCUMULATOR_KEY =
38+
AttributeKey.newInstance("cloudnet_bridge$forward_data_accumulator");
39+
40+
/**
41+
* List of forwarded properties. Should only be appended to.
42+
*/
43+
public final List<Property> properties = new ArrayList<>();
44+
45+
/**
46+
* The unique id of the forwarded player.
47+
*/
48+
public UUID uniqueId;
49+
50+
/**
51+
* Converts the accumulated data into a game profile.
52+
*
53+
* @param name the name of the player.
54+
* @return the constructed game profile from the accumulated data.
55+
* @throws NullPointerException if the given name is null or this accumulator wasn't filled properly.
56+
*/
57+
public @NotNull GameProfile toGameProfile(@NotNull String name) {
58+
var profile = new GameProfile(this.uniqueId, name);
59+
for (var property : this.properties) {
60+
profile.getProperties().put(property.getName(), property);
61+
}
62+
63+
return profile;
64+
}
65+
}

0 commit comments

Comments
 (0)