forked from JackyyTV/DimensionalEdibles
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Renormalize all nonconformant files to LF style EOL
- Loading branch information
Showing
23 changed files
with
1,670 additions
and
1,670 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 |
---|---|---|
@@ -1,84 +1,84 @@ | ||
buildscript { | ||
repositories { | ||
jcenter() | ||
maven { url = "http://files.minecraftforge.net/maven" } | ||
} | ||
dependencies { | ||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' | ||
} | ||
} | ||
apply plugin: 'net.minecraftforge.gradle.forge' | ||
|
||
version = "${mc_version}-${mod_version}" | ||
group = "jackyy.dimensionaledibles" | ||
archivesBaseName = "DimensionalEdibles" | ||
|
||
sourceCompatibility = targetCompatibility = "1.8" | ||
compileJava { | ||
sourceCompatibility = targetCompatibility = "1.8" | ||
} | ||
|
||
minecraft { | ||
version = "${forge_version}" | ||
runDir = "run" | ||
mappings = "${mappings_version}" | ||
|
||
replace '@FINGERPRINT@', project.findProperty('signSHA1') | ||
replaceIn "DimensionalEdibles.java" | ||
} | ||
|
||
repositories { | ||
maven { | ||
name = "JEI Maven" | ||
url "http://dvs1.progwml6.com/files/maven" | ||
} | ||
maven { | ||
name = "Hwyla Maven" | ||
url "http://tehnut.info/maven" | ||
} | ||
maven { | ||
name = "TOP Maven" | ||
url = "http://maven.tterrag.com" | ||
} | ||
} | ||
|
||
dependencies { | ||
deobfCompile "mezz.jei:jei_1.12.2:+" | ||
deobfCompile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2" | ||
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.+" | ||
} | ||
|
||
processResources { | ||
inputs.property "version", project.version | ||
inputs.property "mcversion", project.minecraft.version | ||
from(sourceSets.main.resources.srcDirs) { | ||
include 'mcmod.info' | ||
expand 'version':project.version, 'mcversion':project.minecraft.version | ||
} | ||
from(sourceSets.main.resources.srcDirs) { | ||
exclude 'mcmod.info' | ||
} | ||
} | ||
|
||
task signJar(type: SignJar, dependsOn: reobfJar) { | ||
onlyIf { | ||
project.hasProperty('keyStore') | ||
} | ||
keyStore = project.findProperty('keyStore') | ||
alias = project.findProperty('keyStoreAlias') | ||
storePass = project.findProperty('keyStorePass') | ||
keyPass = project.findProperty('keyStoreKeyPass') | ||
inputFile = jar.archivePath | ||
outputFile = jar.archivePath | ||
} | ||
|
||
build.dependsOn signJar | ||
|
||
task deobfJar(type: Jar) { | ||
from sourceSets.main.output | ||
classifier = 'deobf' | ||
} | ||
|
||
artifacts { | ||
archives deobfJar | ||
} | ||
buildscript { | ||
repositories { | ||
jcenter() | ||
maven { url = "http://files.minecraftforge.net/maven" } | ||
} | ||
dependencies { | ||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' | ||
} | ||
} | ||
apply plugin: 'net.minecraftforge.gradle.forge' | ||
|
||
version = "${mc_version}-${mod_version}" | ||
group = "jackyy.dimensionaledibles" | ||
archivesBaseName = "DimensionalEdibles" | ||
|
||
sourceCompatibility = targetCompatibility = "1.8" | ||
compileJava { | ||
sourceCompatibility = targetCompatibility = "1.8" | ||
} | ||
|
||
minecraft { | ||
version = "${forge_version}" | ||
runDir = "run" | ||
mappings = "${mappings_version}" | ||
|
||
replace '@FINGERPRINT@', project.findProperty('signSHA1') | ||
replaceIn "DimensionalEdibles.java" | ||
} | ||
|
||
repositories { | ||
maven { | ||
name = "JEI Maven" | ||
url "http://dvs1.progwml6.com/files/maven" | ||
} | ||
maven { | ||
name = "Hwyla Maven" | ||
url "http://tehnut.info/maven" | ||
} | ||
maven { | ||
name = "TOP Maven" | ||
url = "http://maven.tterrag.com" | ||
} | ||
} | ||
|
||
dependencies { | ||
deobfCompile "mezz.jei:jei_1.12.2:+" | ||
deobfCompile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2" | ||
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.+" | ||
} | ||
|
||
processResources { | ||
inputs.property "version", project.version | ||
inputs.property "mcversion", project.minecraft.version | ||
from(sourceSets.main.resources.srcDirs) { | ||
include 'mcmod.info' | ||
expand 'version':project.version, 'mcversion':project.minecraft.version | ||
} | ||
from(sourceSets.main.resources.srcDirs) { | ||
exclude 'mcmod.info' | ||
} | ||
} | ||
|
||
task signJar(type: SignJar, dependsOn: reobfJar) { | ||
onlyIf { | ||
project.hasProperty('keyStore') | ||
} | ||
keyStore = project.findProperty('keyStore') | ||
alias = project.findProperty('keyStoreAlias') | ||
storePass = project.findProperty('keyStorePass') | ||
keyPass = project.findProperty('keyStoreKeyPass') | ||
inputFile = jar.archivePath | ||
outputFile = jar.archivePath | ||
} | ||
|
||
build.dependsOn signJar | ||
|
||
task deobfJar(type: Jar) { | ||
from sourceSets.main.output | ||
classifier = 'deobf' | ||
} | ||
|
||
artifacts { | ||
archives deobfJar | ||
} |
110 changes: 55 additions & 55 deletions
110
src/main/java/jackyy/dimensionaledibles/DimensionalEdibles.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,55 +1,55 @@ | ||
package jackyy.dimensionaledibles; | ||
|
||
import jackyy.dimensionaledibles.proxy.CommonProxy; | ||
import jackyy.dimensionaledibles.registry.ModBlocks; | ||
import net.minecraft.creativetab.CreativeTabs; | ||
import net.minecraft.item.ItemStack; | ||
import net.minecraftforge.fml.common.Mod; | ||
import net.minecraftforge.fml.common.SidedProxy; | ||
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; | ||
import net.minecraftforge.fml.common.event.FMLInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; | ||
import org.apache.logging.log4j.LogManager; | ||
import org.apache.logging.log4j.Logger; | ||
|
||
@Mod(modid = DimensionalEdibles.MODID, name = DimensionalEdibles.MODNAME, version = DimensionalEdibles.VERSION, acceptedMinecraftVersions = DimensionalEdibles.MCVERSION, dependencies = DimensionalEdibles.DEPENDS, certificateFingerprint = "@FINGERPRINT@", useMetadata = true) | ||
public class DimensionalEdibles { | ||
|
||
public static final String VERSION = "1.3.1"; | ||
public static final String MCVERSION = "[1.12,1.13)"; | ||
public static final String MODID = "dimensionaledibles"; | ||
public static final String MODNAME = "Dimensional Edibles"; | ||
public static final String DEPENDS = "after:waila;after:theoneprobe;after:jei@[4.12.0.0,);"; | ||
public static final CreativeTabs TAB = new CreativeTabs(MODID) { | ||
@Override | ||
public ItemStack createIcon() { | ||
return new ItemStack(ModBlocks.endCake); | ||
} | ||
}; | ||
public static Logger logger = LogManager.getLogger(MODNAME); | ||
|
||
@SidedProxy(serverSide = "jackyy.dimensionaledibles.proxy.CommonProxy", clientSide = "jackyy.dimensionaledibles.proxy.ClientProxy") | ||
public static CommonProxy proxy; | ||
|
||
@Mod.EventHandler | ||
public void preInit(FMLPreInitializationEvent event) { | ||
proxy.preInit(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void init(FMLInitializationEvent event) { | ||
proxy.init(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void postInit(FMLPostInitializationEvent event) { | ||
proxy.postInit(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void onFingerprintViolation(FMLFingerprintViolationEvent event) { | ||
logger.warn("Invalid fingerprint detected! The file " + event.getSource().getName() + " may have been modified. This will NOT be supported by the mod author!"); | ||
} | ||
|
||
} | ||
package jackyy.dimensionaledibles; | ||
|
||
import jackyy.dimensionaledibles.proxy.CommonProxy; | ||
import jackyy.dimensionaledibles.registry.ModBlocks; | ||
import net.minecraft.creativetab.CreativeTabs; | ||
import net.minecraft.item.ItemStack; | ||
import net.minecraftforge.fml.common.Mod; | ||
import net.minecraftforge.fml.common.SidedProxy; | ||
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; | ||
import net.minecraftforge.fml.common.event.FMLInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; | ||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; | ||
import org.apache.logging.log4j.LogManager; | ||
import org.apache.logging.log4j.Logger; | ||
|
||
@Mod(modid = DimensionalEdibles.MODID, name = DimensionalEdibles.MODNAME, version = DimensionalEdibles.VERSION, acceptedMinecraftVersions = DimensionalEdibles.MCVERSION, dependencies = DimensionalEdibles.DEPENDS, certificateFingerprint = "@FINGERPRINT@", useMetadata = true) | ||
public class DimensionalEdibles { | ||
|
||
public static final String VERSION = "1.3.1"; | ||
public static final String MCVERSION = "[1.12,1.13)"; | ||
public static final String MODID = "dimensionaledibles"; | ||
public static final String MODNAME = "Dimensional Edibles"; | ||
public static final String DEPENDS = "after:waila;after:theoneprobe;after:jei@[4.12.0.0,);"; | ||
public static final CreativeTabs TAB = new CreativeTabs(MODID) { | ||
@Override | ||
public ItemStack createIcon() { | ||
return new ItemStack(ModBlocks.endCake); | ||
} | ||
}; | ||
public static Logger logger = LogManager.getLogger(MODNAME); | ||
|
||
@SidedProxy(serverSide = "jackyy.dimensionaledibles.proxy.CommonProxy", clientSide = "jackyy.dimensionaledibles.proxy.ClientProxy") | ||
public static CommonProxy proxy; | ||
|
||
@Mod.EventHandler | ||
public void preInit(FMLPreInitializationEvent event) { | ||
proxy.preInit(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void init(FMLInitializationEvent event) { | ||
proxy.init(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void postInit(FMLPostInitializationEvent event) { | ||
proxy.postInit(event); | ||
} | ||
|
||
@Mod.EventHandler | ||
public void onFingerprintViolation(FMLFingerprintViolationEvent event) { | ||
logger.warn("Invalid fingerprint detected! The file " + event.getSource().getName() + " may have been modified. This will NOT be supported by the mod author!"); | ||
} | ||
|
||
} |
Oops, something went wrong.