hopefully ignore file picked up right
This commit is contained in:
Mohammad-Ali Minaie
52
.gitignore
vendored
52
.gitignore
vendored
@@ -16,4 +16,54 @@ server.properties
|
||||
crash-reports
|
||||
saves
|
||||
usernamecache.json
|
||||
options.txt
|
||||
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
|
||||
|
||||
|
||||
5
.idea/gradle.xml
generated
5
.idea/gradle.xml
generated
@@ -5,6 +5,11 @@
|
||||
<GradleProjectSettings>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
7
.idea/misc.xml
generated
7
.idea/misc.xml
generated
@@ -1,5 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<list size="3">
|
||||
<item index="0" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod" />
|
||||
<item index="1" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod.EventHandler" />
|
||||
<item index="2" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.eventhandler.SubscribeEvent" />
|
||||
</list>
|
||||
</component>
|
||||
<component name="PreferredVcsStorage">
|
||||
<preferredVcsName>ApexVCS</preferredVcsName>
|
||||
</component>
|
||||
|
||||
3
.idea/modules.xml
generated
3
.idea/modules.xml
generated
@@ -3,6 +3,9 @@
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/PrimalEnergy.iml" filepath="$PROJECT_DIR$/PrimalEnergy.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/PrimalEnergy_api.iml" filepath="$PROJECT_DIR$/.idea/modules/PrimalEnergy_api.iml" group="PrimalEnergy" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/PrimalEnergy_main.iml" filepath="$PROJECT_DIR$/.idea/modules/PrimalEnergy_main.iml" group="PrimalEnergy" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/PrimalEnergy_test.iml" filepath="$PROJECT_DIR$/.idea/modules/PrimalEnergy_test.iml" group="PrimalEnergy" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
930
.idea/workspace.xml
generated
930
.idea/workspace.xml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id="PrimalEnergy" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<module external.linked.project.id="PrimalEnergy" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nmd.primal.energy" external.system.module.version="0.0.1" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="minecraft" name="Minecraft">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="McpModuleSettings">
|
||||
<option name="mappingFiles">
|
||||
<set>
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/mcp-notch.srg" />
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/srg.exc" />
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/notch-srg.srg" />
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/mcp-srg.srg" />
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/notch-mcp.srg" />
|
||||
<option value="$USER_HOME$/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_snapshot/20171003/1.12.2/srgs/mcp.exc" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="mcpVersion" value="snapshot_20171003" />
|
||||
<option name="minecraftVersion" value="1.12.2" />
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/out" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
|
||||
103
build.gradle
103
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
|
||||
// <MINECRAFT-VERSION> and <JEI-VERSION> can be found on CurseForge, check the file name of the version you want.
|
||||
//deobfCompile "mezz.jei:jei_<MINECRAFT-VERSION>:<JEI-VERSION>"
|
||||
//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 //
|
||||
@@ -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
|
||||
|
||||
7
src/main/java/nmd/primal/energy/Energy.java
Normal file
7
src/main/java/nmd/primal/energy/Energy.java
Normal file
@@ -0,0 +1,7 @@
|
||||
package nmd.primal.energy;
|
||||
|
||||
public class Energy {
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package nmd.primal.sample.client;
|
||||
package nmd.primal.energy.client;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ClientProxy extends CommonProxy
|
||||
@@ -1,4 +1,4 @@
|
||||
package nmd.primal.sample.common;
|
||||
package nmd.primal.energy.common;
|
||||
|
||||
public class CommonProxy
|
||||
{
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user