Skip to content

Commit fb93c63

Browse files
committed
Orespawn 3.2.1 release
Also fix Jar Signing
1 parent 4239447 commit fb93c63

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed

build.gradle

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
dependencies {
2020
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
2121
classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.0.9'
22-
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5'
22+
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
2323
}
2424
}
2525

@@ -72,8 +72,10 @@ minecraft {
7272
version = '1.10.2-12.18.3.2185'
7373
runDir = 'run'
7474
mappings = 'stable_29'
75-
// coreMod = ""
75+
// coreMod = ''
7676
makeObfSourceJar = false
77+
78+
replace '@FINGERPRINT@', project.findProperty('signSHA1')
7779
}
7880

7981
repositories {
@@ -179,6 +181,26 @@ task deobfJar(type: Jar) {
179181
from sourceSets.main.output
180182
}
181183

184+
task signJar(type: SignJar, dependsOn: reobfJar) {
185+
186+
// Skips if the keyStore property is missing.
187+
onlyIf {
188+
project.hasProperty('keyStore')
189+
}
190+
191+
// findProperty allows us to reference the property without it existing.
192+
// Using project.propName would cause the script to fail validation if
193+
// the property did not exist.
194+
keyStore = project.findProperty('keyStore')
195+
alias = project.findProperty('keyStoreAlias')
196+
storePass = project.findProperty('keyStorePass')
197+
keyPass = project.findProperty('keyStoreKeyPass')
198+
inputFile = jar.archivePath
199+
outputFile = jar.archivePath
200+
}
201+
202+
build.dependsOn signJar
203+
182204
task javadocJar(type: Jar, dependsOn: javadoc) {
183205
classifier = 'javadoc'
184206
from javadoc.getDestinationDir()
@@ -232,7 +254,7 @@ curseforge {
232254
project {
233255
id = "245586"
234256
changelog = file("CHANGELOG.txt")
235-
releaseType = "alpha"
257+
releaseType = "release"
236258
def projName = "OreSpawn"
237259
def displayVersion = getVersion("VERSION", mod_file)
238260
if (System.getenv().BUILD_NUMBER) {

src/main/java/com/mcmoddev/orespawn/OreSpawn.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.apache.logging.log4j.LogManager;
2323
import org.apache.logging.log4j.Logger;
2424

25-
2625
import net.minecraftforge.common.MinecraftForge;
2726
import net.minecraftforge.fml.common.Mod;
2827
import net.minecraftforge.fml.common.Mod.EventHandler;
2928
import net.minecraftforge.fml.common.Mod.Instance;
29+
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
3030
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
3131
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
3232
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -42,7 +42,8 @@
4242
@Mod(modid = Constants.MODID,
4343
name = Constants.NAME,
4444
version = Constants.VERSION,
45-
acceptedMinecraftVersions = "[1.10.2,)")
45+
acceptedMinecraftVersions = "[1.10.2,)",
46+
certificateFingerprint = "@FINGERPRINT@")
4647

4748
public class OreSpawn {
4849
@Instance
@@ -61,6 +62,11 @@ public static Map<Integer, List<SpawnBuilder>> getSpawns() {
6162
return spawns;
6263
}
6364

65+
@EventHandler
66+
public void onFingerprintViolation(FMLFingerprintViolationEvent event) {
67+
LOGGER.warn("Invalid fingerprint detected!");
68+
}
69+
6470
@EventHandler
6571
public void preInit(FMLPreInitializationEvent ev) {
6672
Config.loadConfig();

src/main/java/com/mcmoddev/orespawn/data/Config.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ private static void saveKnownConfigs() {
133133
File in = p.toFile();
134134

135135
JsonArray data = new JsonArray();
136-
137-
extractedConfigs.forEach( val -> data.add( new JsonPrimitive(val) ) );
136+
137+
extractedConfigs.forEach(val -> data.add(new JsonPrimitive(val)));
138138

139139
try {
140140
FileUtils.writeStringToFile(in, gson.toJson(data), Charset.defaultCharset());

src/main/java/com/mcmoddev/orespawn/data/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public class Constants {
44
public static final String MODID = "orespawn";
55
public static final String NAME = "MMD OreSpawn";
6-
public static final String VERSION = "3.2.0";
6+
public static final String VERSION = "3.2.1";
77
public static final String RETROGEN_KEY = "Retrogen";
88
public static final String CONFIG_FILE = "config/orespawn.cfg";
99
public static final String FORCE_RETROGEN_KEY = "Force Retrogen";

0 commit comments

Comments
 (0)