Skip to content

Commit 98ef303

Browse files
committed
Порт на Minecraft 1.12.2
1 parent 06ec92b commit 98ef303

File tree

8 files changed

+67
-64
lines changed

8 files changed

+67
-64
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ObjectStream Blocker for Minecraft 1.7.10
1+
# ObjectStream Blocker for Minecraft 1.12.2
22

33
Этот мод-патчер препятствует эксплуатации RCE-уязвимостей в модификациях с использованием `ObjectInputStream` (_десериализация объекта_).
44

build.gradle

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,19 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
11-
changing = true
12-
}
10+
classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
1311
}
1412
}
1513

1614
repositories {
1715
mavenCentral()
1816
}
1917

20-
apply plugin: 'forge'
18+
apply plugin: 'net.minecraftforge.gradle'
2119
apply plugin: 'idea'
2220

2321
// Project settings
24-
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
22+
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaVersion.VERSION_1_8 // Need this here so eclipse task generates correctly.
2523

2624
idea {
2725
module {
@@ -31,19 +29,47 @@ idea {
3129
}
3230

3331
minecraft {
34-
version = '1.7.10-10.13.4.1614-1.7.10'
35-
runDir = 'minecraft'
32+
mappings channel: 'stable', version: '39-1.12'
33+
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
34+
35+
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
36+
37+
// Default run configurations.
38+
// These can be tweaked, removed, or duplicated as needed.
39+
runs {
40+
client {
41+
workingDirectory project.file('minecraft')
42+
43+
// Recommended logging data for a userdev environment
44+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
45+
46+
// Recommended logging level for the console
47+
property 'forge.logging.console.level', 'debug'
48+
}
49+
50+
server {
51+
// Recommended logging data for a userdev environment
52+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
53+
54+
// Recommended logging level for the console
55+
property 'forge.logging.console.level', 'debug'
56+
}
57+
}
3658
}
3759

3860
dependencies {
61+
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
62+
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
63+
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
64+
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
3965
}
4066

41-
tasks.withType(JavaCompile).configureEach {
67+
tasks.withType(JavaCompile) {
4268
options.encoding = 'UTF-8'
4369
}
4470

45-
tasks.withType(Jar).configureEach {
46-
archiveVersion.set(project.minecraft.version + '-' + project.version)
71+
tasks.withType(Jar) {
72+
version = project.ext.minecraft_version + '-' + project.version
4773
}
4874

4975
jar {
@@ -53,8 +79,12 @@ jar {
5379
}
5480
}
5581

82+
// Example configuration to allow publishing using the maven-publish task
83+
// This is the preferred method to reobfuscate your jar file
84+
jar.finalizedBy('reobfJar')
85+
5686
tasks.register('devJar', Jar) {
57-
archiveClassifier.set('dev')
87+
classifier = 'dev'
5888
manifest = jar.manifest
5989
from sourceSets.main.output
6090
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Project
22
group=me.theandrey
33
version=1.0
4-
minecraft.version=1.7.10
4+
minecraft_version=1.12.2
55

66
# Repositories
7-
minecraftforge.repository.url=https://files.minecraftforge.net/maven
7+
minecraftforge.repository.url=https://maven.minecraftforge.net/

gradle/wrapper/gradle-wrapper.jar

-3.9 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

Lines changed: 20 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/me/theandrey/objectstream/asm/LoadingPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.io.File;
44
import java.util.Map;
5-
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
65
import me.theandrey.objectstream.Config;
6+
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
77

88
@IFMLLoadingPlugin.SortingIndex(2000)
99
@IFMLLoadingPlugin.TransformerExclusions("me.theandrey.objectstream.asm.")

0 commit comments

Comments
 (0)