Skip to content

Commit a9da79c

Browse files
TonimatasDEVTonimatasDEV
committed
Fix some problems, now the subprojects are independent
1 parent deac789 commit a9da79c

File tree

91 files changed

+1368
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1368
-153
lines changed

‎buildSrc/src/main/java/dev/tonimatas/packetfixer/LoaderExtension.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
import org.gradle.api.JavaVersion;
44

5-
import java.util.Collections;
6-
import java.util.List;
7-
85
public class LoaderExtension {
96
private String minecraftVersion;
107
private JavaVersion javaVersion;
11-
private List<String> projects = Collections.emptyList();
128

139
public String getMinecraftVersion() {
1410
return minecraftVersion;
@@ -18,19 +14,11 @@ public JavaVersion getJavaVersion() {
1814
return javaVersion;
1915
}
2016

21-
public List<String> getProjects() {
22-
return projects;
23-
}
24-
2517
public void setMinecraftVersion(String minecraftVersion) {
2618
this.minecraftVersion = minecraftVersion;
2719
}
2820

2921
public void setJavaVersion(JavaVersion javaVersion) {
3022
this.javaVersion = javaVersion;
3123
}
32-
33-
public void setProjects(List<String> projects) {
34-
this.projects = projects;
35-
}
3624
}

‎buildSrc/src/main/java/dev/tonimatas/packetfixer/fabric/FabricModPlugin.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
import net.fabricmc.loom.LoomGradlePlugin;
55
import net.fabricmc.loom.api.LoomGradleExtensionAPI;
66
import org.gradle.api.Project;
7-
import org.gradle.api.file.FileCollection;
87
import org.gradle.api.plugins.JavaPluginExtension;
9-
import org.gradle.api.tasks.SourceSet;
10-
import org.gradle.api.tasks.SourceSetContainer;
11-
import org.gradle.api.tasks.compile.JavaCompile;
128

139
@SuppressWarnings({"unused", "UnstableApiUsage"})
1410
public class FabricModPlugin extends LoaderPlugin {
@@ -33,17 +29,6 @@ public void apply(Project project) {
3329
if (extension.getFabricVersion() != null) {
3430
project.getDependencies().add("modImplementation", "net.fabricmc.fabric-api:fabric-api:" + extension.getFabricVersion() + "+" + extension.getMinecraftVersion());
3531
}
36-
37-
for (String projectStr : extension.getProjects()) {
38-
String javaVersionStr = extension.getJavaVersion().toString().replaceAll("VERSION_", "");
39-
SourceSetContainer targetSourceSets = p.project(":fabric:java" + javaVersionStr + ":" + projectStr).getExtensions().getByType(SourceSetContainer.class);
40-
SourceSet targetMain = targetSourceSets.getByName("main");
41-
42-
project.getTasks().named("compileJava", JavaCompile.class).configure(compileJava -> {
43-
FileCollection extraSources = targetMain.getAllJava().getSourceDirectories();
44-
compileJava.setSource(compileJava.getSource().plus(extraSources));
45-
});
46-
}
4732

4833
project.getExtensions().configure(LoomGradleExtensionAPI.class, loom -> {
4934
project.getDependencies().add("mappings", loom.officialMojangMappings());

‎buildSrc/src/main/java/dev/tonimatas/packetfixer/forge/ForgeModPlugin.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
import net.minecraftforge.gradle.userdev.UserDevExtension;
55
import net.minecraftforge.gradle.userdev.UserDevPlugin;
66
import org.gradle.api.Project;
7-
import org.gradle.api.file.FileCollection;
87
import org.gradle.api.plugins.JavaPluginExtension;
9-
import org.gradle.api.tasks.SourceSet;
10-
import org.gradle.api.tasks.SourceSetContainer;
11-
import org.gradle.api.tasks.compile.JavaCompile;
128
import org.gradle.jvm.tasks.Jar;
139
import org.spongepowered.asm.gradle.plugins.MixinExtension;
1410
import org.spongepowered.asm.gradle.plugins.MixinGradlePlugin;
@@ -37,16 +33,6 @@ public void apply(Project project) {
3733
});
3834

3935
project.getTasks().named("jar", Jar.class).configure(jar -> jar.finalizedBy("reobfJar"));
40-
41-
for (String projectStr : extension.getProjects()) {
42-
SourceSetContainer targetSourceSets = p.project(":forge:java17:" + projectStr).getExtensions().getByType(SourceSetContainer.class);
43-
SourceSet targetMain = targetSourceSets.getByName("main");
44-
45-
project.getTasks().named("compileJava", JavaCompile.class).configure(compileJava -> {
46-
FileCollection extraSources = targetMain.getAllJava().getSourceDirectories();
47-
compileJava.setSource(compileJava.getSource().plus(extraSources));
48-
});
49-
}
5036

5137
project.getExtensions().configure(MixinExtension.class, mixin -> {
5238
String version = minecraftVersion.replaceAll("\\.", "_");

‎fabric/java17/v1_18/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ plugins {
55
loaderModPlugin {
66
minecraftVersion = "1.18"
77
javaVersion = JavaVersion.VERSION_17
8-
}
8+
}

‎fabric/java17/v1_18/src/main/java/dev/tonimatas/packetfixer/mixins/v1_18_fabric/MixinPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.tonimatas.packetfixer.mixins.v1_18_fabric;
22

3+
import dev.tonimatas.packetfixer.common.Config;
34
import net.fabricmc.loader.api.FabricLoader;
45
import net.fabricmc.loader.api.ModContainer;
56
import org.apache.logging.log4j.LogManager;
@@ -16,6 +17,7 @@ public class MixinPlugin implements IMixinConfigPlugin {
1617
@Override
1718
public void onLoad(String s) {
1819
if (isThisVersion()) {
20+
Config.runProperties();
1921
LogManager.getLogger().info("Packet Fixer fabric 1.18.X has been applied successfully.");
2022
}
2123
}

‎fabric/java17/v1_19/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ plugins {
22
id("dev.tonimatas.packetfixer.fabric")
33
}
44

5-
dependencies {
6-
implementation(project(":fabric:java17:v1_18"))
7-
}
8-
95
loaderModPlugin {
106
minecraftVersion = "1.19.2"
117
javaVersion = JavaVersion.VERSION_17
12-
projects = listOf("v1_18")
138
}

‎fabric/java17/v1_19/src/main/java/dev/tonimatas/packetfixer/mixins/v1_19_fabric/ClientboundCustomPayloadPacketMixin.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package dev.tonimatas.packetfixer.mixins.v1_19_fabric;
2+
3+
import dev.tonimatas.packetfixer.common.Config;
4+
import dev.tonimatas.packetfixer.common.Messages;
5+
import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.injection.Constant;
8+
import org.spongepowered.asm.mixin.injection.ModifyConstant;
9+
10+
@Mixin(ClientboundCustomPayloadPacket.class)
11+
public class ClientboundCustomPayloadPacketMixin {
12+
@ModifyConstant(method = "<init>*", constant = @Constant(intValue = 1048576))
13+
private int packetfixer$newSize(int value) {
14+
return Config.getPacketSize();
15+
}
16+
17+
@ModifyConstant(method = "<init>*", constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
18+
private String packetfixer$newMessage(String value) {
19+
return Messages.getPayloadMessage();
20+
}
21+
}

‎fabric/java17/v1_19/src/main/java/dev/tonimatas/packetfixer/mixins/v1_19_fabric/ClientboundCustomQueryPacketMixin.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package dev.tonimatas.packetfixer.mixins.v1_19_fabric;
2+
3+
import dev.tonimatas.packetfixer.common.Config;
4+
import dev.tonimatas.packetfixer.common.Messages;
5+
import net.minecraft.network.protocol.login.ClientboundCustomQueryPacket;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.injection.Constant;
8+
import org.spongepowered.asm.mixin.injection.ModifyConstant;
9+
10+
@Mixin(ClientboundCustomQueryPacket.class)
11+
public class ClientboundCustomQueryPacketMixin {
12+
@ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 1048576))
13+
private int packetfixer$newSize(int value) {
14+
return Config.getPacketSize();
15+
}
16+
17+
@ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
18+
private String packetfixer$newMessage(String value) {
19+
return Messages.getPayloadMessage();
20+
}
21+
}

‎fabric/java17/v1_19/src/main/java/dev/tonimatas/packetfixer/mixins/v1_19_fabric/ClientboundLevelChunkPacketDataMixin.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package dev.tonimatas.packetfixer.mixins.v1_19_fabric;
2+
3+
import dev.tonimatas.packetfixer.common.Config;
4+
import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.Constant;
7+
import org.spongepowered.asm.mixin.injection.ModifyConstant;
8+
9+
@Mixin(ClientboundLevelChunkPacketData.class)
10+
public class ClientboundLevelChunkPacketDataMixin {
11+
@ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;II)V", constant = @Constant(intValue = 2097152))
12+
private int packetfixer$newSize(int value) {
13+
return Config.getChunkPacketData();
14+
}
15+
16+
@ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;II)V", constant = @Constant(stringValue = "Chunk Packet trying to allocate too much memory on read."))
17+
private String packetfixer$newMessage(String constant) {
18+
return constant + " (" + Config.getChunkPacketData() + ") Modify it in the Packet Fixer config.";
19+
}
20+
}

‎fabric/java17/v1_19/src/main/java/dev/tonimatas/packetfixer/mixins/v1_19_fabric/CompressionDecoderMixin.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package dev.tonimatas.packetfixer.mixins.v1_19_fabric;
2+
3+
import dev.tonimatas.packetfixer.common.Config;
4+
import net.minecraft.network.CompressionDecoder;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.Constant;
7+
import org.spongepowered.asm.mixin.injection.ModifyConstant;
8+
9+
@Mixin(CompressionDecoder.class)
10+
public class CompressionDecoderMixin {
11+
@ModifyConstant(method = "decode", constant = @Constant(intValue = 8388608))
12+
private int packetfixer$newSize(int value) {
13+
return Config.getDecoderSize();
14+
}
15+
}

0 commit comments

Comments
 (0)