-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ported to 1.14
- Loading branch information
Showing
20 changed files
with
264 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,4 +20,6 @@ build | |
# other | ||
eclipse | ||
run | ||
classes | ||
|
||
# Files from Forge MDK | ||
forge*changelog.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,95 @@ | ||
buildscript { | ||
repositories { | ||
maven { url = 'https://files.minecraftforge.net/maven' } | ||
jcenter() | ||
maven { url = "https://files.minecraftforge.net/maven" } | ||
mavenCentral() | ||
} | ||
dependencies { | ||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' | ||
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true | ||
} | ||
} | ||
apply plugin: 'net.minecraftforge.gradle.forge' | ||
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. | ||
apply plugin: 'net.minecraftforge.gradle' | ||
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. | ||
apply plugin: 'eclipse' | ||
apply plugin: 'maven-publish' | ||
|
||
|
||
version = "1.12.2-1.0.0" | ||
version = "1.14.4-1.0.0" | ||
group = "network.pxl8.stonecatalysts" | ||
archivesBaseName = "stonecatalysts" | ||
|
||
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. | ||
compileJava { | ||
sourceCompatibility = targetCompatibility = '1.8' | ||
} | ||
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. | ||
|
||
minecraft { | ||
version = "1.12.2-14.23.5.2847" | ||
runDir = "run" | ||
|
||
// the mappings can be changed at any time, and must be in the following format. | ||
// snapshot_YYYYMMDD snapshot are built nightly. | ||
// stable_# stables are built at the discretion of the MCP team. | ||
// Use non-default mappings at your own risk. they may not always work. | ||
// simply re-run your setup task after changing the mappings to update your workspace. | ||
mappings = "snapshot_20171003" | ||
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
mappings channel: 'snapshot', version: '20190719-1.14.3' | ||
|
||
runs { | ||
client { | ||
workingDirectory project.file('run') | ||
|
||
property 'forge.logging.console.level', 'debug' | ||
|
||
mods { | ||
examplemod { | ||
source sourceSets.main | ||
} | ||
} | ||
} | ||
|
||
server { | ||
workingDirectory project.file('run') | ||
|
||
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
||
property 'forge.logging.console.level', 'debug' | ||
|
||
mods { | ||
examplemod { | ||
source sourceSets.main | ||
} | ||
} | ||
} | ||
|
||
data { | ||
workingDirectory project.file('run') | ||
|
||
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
||
property 'forge.logging.console.level', 'debug' | ||
|
||
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/') | ||
|
||
mods { | ||
examplemod { | ||
source sourceSets.main | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
repositories { | ||
|
||
maven { | ||
name = "CurseForge" | ||
url = "https://minecraft.curseforge.com/api/maven/" | ||
} | ||
} | ||
|
||
dependencies { | ||
minecraft 'net.minecraftforge:forge:1.14.4-28.2.0' | ||
|
||
compileOnly "quark:Quark:r2.0:210" | ||
} | ||
|
||
processResources { | ||
// this will ensure that this task is redone when the versions change. | ||
inputs.property "version", project.version | ||
inputs.property "mcversion", project.minecraft.version | ||
|
||
// replace stuff in mcmod.info, nothing else | ||
from(sourceSets.main.resources.srcDirs) { | ||
include 'mcmod.info' | ||
|
||
// replace version and mcversion | ||
expand 'version':project.version, 'mcversion':project.minecraft.version | ||
jar { | ||
manifest { | ||
attributes([ | ||
"Specification-Title": "stonecatalysts", | ||
"Specification-Vendor": "pxl8", | ||
"Specification-Version": "1", // We are version 1 of ourselves | ||
"Implementation-Title": project.name, | ||
"Implementation-Version": "${version}", | ||
"Implementation-Vendor" : "pxl8", | ||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") | ||
]) | ||
} | ||
|
||
// copy everything else except the mcmod.info | ||
from(sourceSets.main.resources.srcDirs) { | ||
exclude 'mcmod.info' | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
org.gradle.jvmargs=-Xmx3G | ||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. | ||
# This is required to provide enough memory for the Minecraft decompilation process. | ||
org.gradle.jvmargs=-Xmx3G | ||
org.gradle.daemon=false |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
#Mon Sep 14 12:28:28 PDT 2015 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 15 additions & 21 deletions
36
src/main/java/network/pxl8/stonecatalysts/StoneCatalysts.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,27 @@ | ||
package network.pxl8.stonecatalysts; | ||
|
||
import net.minecraftforge.common.MinecraftForge; | ||
import net.minecraftforge.fml.ModLoadingContext; | ||
import net.minecraftforge.fml.common.Mod; | ||
import net.minecraftforge.fml.common.SidedProxy; | ||
import net.minecraftforge.fml.common.event.FMLInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; | ||
import net.minecraftforge.fml.config.ModConfig; | ||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; | ||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; | ||
import net.minecraftforge.fml.loading.FMLPaths; | ||
import network.pxl8.stonecatalysts.config.Configuration; | ||
import network.pxl8.stonecatalysts.lib.LibMeta; | ||
import network.pxl8.stonecatalysts.proxy.Proxy; | ||
|
||
@Mod(modid = LibMeta.MOD_ID, version = LibMeta.VERSION, acceptableRemoteVersions = "*") | ||
@Mod("stonecatalysts") | ||
public class StoneCatalysts { | ||
@Mod.Instance | ||
public static StoneCatalysts instance; | ||
public StoneCatalysts() { | ||
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); | ||
|
||
@SidedProxy(clientSide = LibMeta.CLIENT_PROXY, serverSide = LibMeta.SERVER_PROXY, modId = LibMeta.MOD_ID) | ||
private static Proxy proxy; | ||
MinecraftForge.EVENT_BUS.register(this); | ||
|
||
@Mod.EventHandler | ||
public void preInit(FMLPreInitializationEvent event) { | ||
proxy.preInit(); | ||
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Configuration.COMMON_CONFIG); | ||
Configuration.loadConfig(Configuration.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("stonecatalysts-common.toml")); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void init(FMLInitializationEvent event) { | ||
proxy.init(); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void postInit(FMLPostInitializationEvent event) { | ||
proxy.postInit(); | ||
private void setup(final FMLCommonSetupEvent event) { | ||
LibMeta.LOG.debug("StoneCatalysts"); | ||
} | ||
} |
Oops, something went wrong.