Skip to content

Commit

Permalink
Added Machine Configuration
Browse files Browse the repository at this point in the history
Added Configuration for Machine Energy Capacity, Energy IO and Tank Capacity
Updated Description and Mod Description
Added Logo
  • Loading branch information
Redfire75369 committed Jun 21, 2021
1 parent 77aa4af commit 585046e
Show file tree
Hide file tree
Showing 29 changed files with 1,061 additions and 385 deletions.
23 changes: 23 additions & 0 deletions .run/buildJar.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Build Jar" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
<option name="externalSystemIdString" value="GRADLE"/>
<option name="scriptParameters" value=""/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="build"/>
</list>
</option>
<option name="vmOptions" value=""/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2"/>
</configuration>
</component>
27 changes: 27 additions & 0 deletions .run/runClient.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Client" type="Application" factoryName="Application" singleton="false">
<envs>
<env name="MOD_CLASSES"
value="examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\resources\main;examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\classes\java\main"/>
<env name="MCP_MAPPINGS" value="official_1.16.5"/>
<env name="MCP_VERSION" value="20210115.111550"/>
<env name="FORGE_VERSION" value="36.1.18"/>
<env name="assetIndex" value="1.16"/>
<env name="assetDirectory" value="C:\Users\Afzal\.gradle\caches\forge_gradle\assets"/>
<env name="nativesDirectory" value="$PROJECT_DIR$/../Simple-Machinery\build\natives"/>
<env name="FORGE_GROUP" value="net.minecraftforge"/>
<env name="target" value="fmluserdevclient"/>
<env name="MC_VERSION" value="1.16.5"/>
</envs>
<option name="MAIN_CLASS_NAME" value="net.minecraftforge.userdev.LaunchTesting"/>
<module name="Simple-Machinery.main"/>
<option name="VM_PARAMETERS"
value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES -XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump &quot;-Dos.name=Windows 10&quot; -Dos.version=10.0"/>
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run"/>
<method v="2">
<option name="Make" enabled="true"/>
<option name="Gradle.BeforeRunTask" enabled="true" tasks=":prepareRunClient"
externalProjectPath="$PROJECT_DIR$"/>
</method>
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/runData.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Data" type="Application" factoryName="Application" singleton="false">
<envs>
<env name="MOD_CLASSES"
value="examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\resources\main;examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\classes\java\main"/>
<env name="MCP_MAPPINGS" value="official_1.16.5"/>
<env name="MCP_VERSION" value="20210115.111550"/>
<env name="FORGE_VERSION" value="36.1.18"/>
<env name="FORGE_GROUP" value="net.minecraftforge"/>
<env name="target" value="fmluserdevdata"/>
<env name="MC_VERSION" value="1.16.5"/>
</envs>
<option name="MAIN_CLASS_NAME" value="net.minecraftforge.userdev.LaunchTesting"/>
<module name="Simple-Machinery.main"/>
<option name="PROGRAM_PARAMETERS"
value="--mod examplemod --all --output C:\Users\Afzal\Mods\Simple-Machinery\src\generated\resources --existing C:\Users\Afzal\Mods\Simple-Machinery\src\main\resources"/>
<option name="VM_PARAMETERS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run"/>
<method v="2">
<option name="Make" enabled="true"/>
<option name="Gradle.BeforeRunTask" enabled="true" tasks=":prepareRunData"
externalProjectPath="$PROJECT_DIR$"/>
</method>
</configuration>
</component>
23 changes: 23 additions & 0 deletions .run/runServer.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Server" type="Application" factoryName="Application" singleton="false">
<envs>
<env name="MOD_CLASSES"
value="examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\resources\main;examplemod%%$PROJECT_DIR$/../Simple-Machinery\build\classes\java\main"/>
<env name="MCP_MAPPINGS" value="official_1.16.5"/>
<env name="MCP_VERSION" value="20210115.111550"/>
<env name="FORGE_VERSION" value="36.1.18"/>
<env name="FORGE_GROUP" value="net.minecraftforge"/>
<env name="target" value="fmluserdevserver"/>
<env name="MC_VERSION" value="1.16.5"/>
</envs>
<option name="MAIN_CLASS_NAME" value="net.minecraftforge.userdev.LaunchTesting"/>
<module name="Simple-Machinery.main"/>
<option name="VM_PARAMETERS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run"/>
<method v="2">
<option name="Make" enabled="true"/>
<option name="Gradle.BeforeRunTask" enabled="true" tasks=":prepareRunServer"
externalProjectPath="$PROJECT_DIR$"/>
</method>
</configuration>
</component>
162 changes: 81 additions & 81 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
buildscript {
repositories {
maven {
url = "https://maven.minecraftforge.net"
}
mavenCentral()
}
dependencies {
classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "4.1.+", changing: true
}
repositories {
maven {
url = "https://maven.minecraftforge.net"
}
mavenCentral()
}
dependencies {
classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "4.1.+", changing: true
}
}
apply plugin: "net.minecraftforge.gradle"

repositories {
maven {
name = "BlameJared"
url = "https://maven.blamejared.com"
}
maven {
name = "Progwml6"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
name = "BlameJared"
url = "https://maven.blamejared.com"
}
maven {
name = "Progwml6"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
name = "Tehnut"
url = "https://maven.tehnut.info"
}
maven {
name = "ModMaven"
url = "https://modmaven.dev/"
}
maven {
name = "ModMaven"
url = "https://modmaven.dev/"
}
}

group = "redfire.mods"
Expand All @@ -38,80 +38,80 @@ version = "${mc_version}-${mod_version}"
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = "1.8"

minecraft {
mappings channel: "official", version: "1.16.5"
mappings channel: "official", version: "1.16.5"
accessTransformer = file("src/main/resources/META-INF/accesstransformer.cfg")

runs {
client {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

mods {
simplemachinery {
source sourceSets.main
}
}
}

server {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

mods {
simplemachinery {
source sourceSets.main
}
}
}

data {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

args "--mod", "simplemachinery", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources/")

mods {
simplemachinery {
source sourceSets.main
}
}
}
}
runs {
client {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

mods {
simplemachinery {
source sourceSets.main
}
}
}

server {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

mods {
simplemachinery {
source sourceSets.main
}
}
}

data {
workingDirectory project.file("run")
property "forge.logging.markers", ""
property "forge.logging.console.level", "debug"

args "--mod", "simplemachinery", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources/")

mods {
simplemachinery {
source sourceSets.main
}
}
}
}
}

sourceSets.main.resources {
srcDir "src/generated/resources"
srcDir "src/generated/resources"
}

dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"

compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}")
runtimeOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}")
runtimeOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}")

compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")

runtimeOnly fg.deobf("mcp.mobius.waila:Hwyla:${hwyla_version}")

runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}")
runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}:additions")
runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}:generators")
runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}")
runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}:additions")
runtimeOnly fg.deobf("mekanism:Mekanism:${mc_version}-${mekanism_version}:generators")
}

jar {
manifest {
attributes([
"Specification-Title": "simplemachinery",
"Specification-Vendor": "Redfire",
"Specification-Version": "1",
"Implementation-Title": project.name,
"Implementation-Version": "${version}",
"Implementation-Vendor" :"Redfire",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
manifest {
attributes([
"Specification-Title" : "simplemachinery",
"Specification-Vendor" : "Redfire",
"Specification-Version" : "1",
"Implementation-Title" : project.name,
"Implementation-Version" : "${version}",
"Implementation-Vendor" : "Redfire",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}
Loading

0 comments on commit 585046e

Please sign in to comment.