diff --git a/.gitignore b/.gitignore index 3f36f4a..7a9be39 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,54 @@ server.properties crash-reports saves usernamecache.json -options.txt \ No newline at end of file +options.txt +README.txt +1.11/saves* +1.11/MinecraftForge-* +1.11/Paulscode* +1.11/logs* +forge-*-changelog.txt +*-fml.txt +.gradle +1.11/build/ +1.11/run/ +1.11/out/ +1.11/tmp/ +1.11/bin/ +1.11/crash-reports +1.11/config/ +1.11/saves/ +1.11/logs +1.11/usercache.json +1.11/usernamecache.json +1.11/options.txt +*.DS_Store +*.iml +*.ipr +*.iws +1.11/eula.txt +1.11/server.properties + +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f4f39e8..ba1ec5c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,11 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 54aedd1..48eb1ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,12 @@ + + + + + + + ApexVCS diff --git a/.idea/modules.xml b/.idea/modules.xml index 4bdacac..6cb7d65 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,9 @@ + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b2335c3..e2005e7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,56 +2,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + @@ -97,6 +845,8 @@ @@ -106,12 +856,20 @@ true DEFINITION_ORDER + + + + - + + @@ -143,6 +976,11 @@ + + + + + - - - - - - - - - - - - - + + + + + + @@ -232,16 +1065,22 @@ - - - - - - - + + + + + - - + + + + + + + + + + @@ -250,11 +1089,32 @@ + + + + + + + + + + + + - - + + + + + + + + + diff --git a/PrimalEnergy.iml b/PrimalEnergy.iml index b7e017f..dd70544 100644 --- a/PrimalEnergy.iml +++ b/PrimalEnergy.iml @@ -1,8 +1,31 @@ - + + + + + + + + + - + + + + + diff --git a/build.gradle b/build.gradle index 654a0e4..f7c37b8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,138 +1,87 @@ buildscript { repositories { jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } -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. - repositories { - //maven { - // name = "JitPack" - // url = 'https://jitpack.io' - //} + maven { + name = "primal" + url "https://maven.nmd.so" + } maven { name = "jei" - url = "http://dvs1.progwml6.com/files/maven" + url "http://dvs1.progwml6.com/files/maven" } - maven { - name = "PrimalCore" - url = "https://maven.nmd.so" - } maven { name "CraftTweaker" url "http://maven.blamejared.com/" } } -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 // Need this here so eclipse task generates correctly. +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'java' compileJava { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 } - -// http://maven.apache.org/guides/mini/guide-naming-conventions.html group = "${mod_group}" -version = "${mod_version}" + buildNumber() +version = "${mod_version}" archivesBaseName = "${mod_name}" +idea { module { inheritOutputDirs = true } } minecraft { version = "${mc_version}" + "-" + "${forge_version}" 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 allways work. - // simply re-run your setup task after changing the mappings to update your workspace. - //mappings = "snapshot_20160312" mappings = "${mcp_mappings}" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - // JEI useDepAts = true // Replace - //replace '1.0.0.0', project.forge_version - replace '@MOD_VERSION@', project.mod_version + buildNumber() - replaceIn 'ModInfo.java' + replace "@VERSION@", project.mod_version } dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - - // SSH - //deployerJars "org.apache.maven.wagon:wagon-ssh:2.10" + // PrimalCore + deobfCompile "nmd.primal.core:PrimalCore:${mc_version}-${primal_version}:dev" // JEI - // https://github.com/mezz/JustEnoughItems - // http://minecraft.curseforge.com/projects/just-enough-items-jei/files - // and can be found on CurseForge, check the file name of the version you want. - //deobfCompile "mezz.jei:jei_:" - //deobfCompile "mezz.jei:jei_${config.mc_version}:${config.jei_version}" - // - // compile against the JEI API - deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api" - // at runtime, use the full JEI jar //runtime "mezz.jei:jei_${mc_version}:${jei_version}" + deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api" - // Baubles - //compile "com.github.azanor:baubles:-SNAPSHOT" - - // PrimalCore - deobfCompile "nmd.primal.core:PrimalCore:${primal_version}:dev" - //runtime "nmd.primal.core:PrimalCore:${primal_version}" + // CraftTweaker + //compile "CraftTweaker2:CraftTweaker2-MC1120-Main:${craftweaker_version}" + //compile "CraftTweaker2:CraftTweaker2-API:${craftweaker_version}" } processResources { // this will ensure that this task is redone when the versions change. inputs.property "version", "${mod_version}" - inputs.property "build", "${mod_build}" inputs.property "mcversion", "${mc_version}" - // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - // replace version and mcversion - expand 'version':"${mod_version}", 'build':"${mod_build}", 'mcversion':"${mc_version}" + expand 'version':"${mod_version}", 'mcversion':"${mc_version}" } - // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' } } -idea { module { inheritOutputDirs = true } } -def buildNumber() { - return (project.mod_build!="" && project.mod_build!="0") ? '.' + project.mod_build : "" -} -// end // +// end // \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8bd064d..cc0f1a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,7 @@ mcp_mappings=snapshot_20171003 mc_version=1.12.2 primal_version=0.6+ -jei_version=4.5+i +jei_version=4.12+ +waila_version=1.7.0-B3 +apple_version=2.1+ craftweaker_version=4.1.6.465 diff --git a/src/main/java/nmd/primal/energy/Energy.java b/src/main/java/nmd/primal/energy/Energy.java new file mode 100644 index 0000000..6016517 --- /dev/null +++ b/src/main/java/nmd/primal/energy/Energy.java @@ -0,0 +1,7 @@ +package nmd.primal.energy; + +public class Energy { + + + +} diff --git a/src/main/java/nmd/primal/sample/client/ClientProxy.java b/src/main/java/nmd/primal/energy/client/ClientProxy.java similarity index 93% rename from src/main/java/nmd/primal/sample/client/ClientProxy.java rename to src/main/java/nmd/primal/energy/client/ClientProxy.java index 0b6ba9e..b821c53 100644 --- a/src/main/java/nmd/primal/sample/client/ClientProxy.java +++ b/src/main/java/nmd/primal/energy/client/ClientProxy.java @@ -1,4 +1,4 @@ -package nmd.primal.sample.client; +package nmd.primal.energy.client; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy diff --git a/src/main/java/nmd/primal/sample/common/CommonProxy.java b/src/main/java/nmd/primal/energy/common/CommonProxy.java similarity index 91% rename from src/main/java/nmd/primal/sample/common/CommonProxy.java rename to src/main/java/nmd/primal/energy/common/CommonProxy.java index d6dd53f..1da4b53 100644 --- a/src/main/java/nmd/primal/sample/common/CommonProxy.java +++ b/src/main/java/nmd/primal/energy/common/CommonProxy.java @@ -1,4 +1,4 @@ -package nmd.primal.sample.common; +package nmd.primal.energy.common; public class CommonProxy { diff --git a/src/main/java/nmd/primal/sample/common/PrimalSample.java b/src/main/java/nmd/primal/energy/common/PrimalSample.java similarity index 96% rename from src/main/java/nmd/primal/sample/common/PrimalSample.java rename to src/main/java/nmd/primal/energy/common/PrimalSample.java index d80cf37..2e383ed 100644 --- a/src/main/java/nmd/primal/sample/common/PrimalSample.java +++ b/src/main/java/nmd/primal/energy/common/PrimalSample.java @@ -1,4 +1,4 @@ -package nmd.primal.sample.common; +package nmd.primal.energy.common; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import nmd.primal.sample.common.init.ModInfo; +import nmd.primal.energy.common.init.ModInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/nmd/primal/sample/common/init/ModInfo.java b/src/main/java/nmd/primal/energy/common/init/ModInfo.java similarity index 98% rename from src/main/java/nmd/primal/sample/common/init/ModInfo.java rename to src/main/java/nmd/primal/energy/common/init/ModInfo.java index 2f9a499..1d739fe 100644 --- a/src/main/java/nmd/primal/sample/common/init/ModInfo.java +++ b/src/main/java/nmd/primal/energy/common/init/ModInfo.java @@ -1,4 +1,4 @@ -package nmd.primal.sample.common.init; +package nmd.primal.energy.common.init; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items;