forked from Mithion/ArsMagica2
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Multiblock thingy + Normal speed book renders the spell.
- Loading branch information
1 parent
9440f8c
commit b1aaf81
Showing
60 changed files
with
8,134 additions
and
8,057 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,113 +1,113 @@ | ||
buildscript { | ||
repositories { | ||
jcenter() | ||
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.2-SNAPSHOT' | ||
classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' | ||
} | ||
} | ||
repositories { | ||
maven { | ||
url "http://dvs1.progwml6.com/files/maven" | ||
} | ||
} | ||
apply plugin: 'net.minecraftforge.gradle.forge' | ||
apply plugin: 'com.matthewprenger.cursegradle' | ||
|
||
sourceCompatibility = JavaVersion.VERSION_1_8 | ||
targetCompatibility = JavaVersion.VERSION_1_8 | ||
|
||
ext.configFile = file('build.properties') | ||
ext.config = parseConfig(configFile) | ||
|
||
version = "${config.version}-${config.build_number}" | ||
group= "am2" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
archivesBaseName = "ArsMagica2" | ||
|
||
|
||
minecraft { | ||
version = "1.10.2-12.18.3.2185" | ||
runDir = "run" | ||
replace 'GRADLE:BUILD', config.build_number | ||
replace 'GRADLE:VERSION', config.version | ||
replaceIn 'ArsMagica2.java' | ||
//replace '${version}', project.version | ||
mappings = "snapshot_20161111" //uncomment this line to use newest Forge mappings. Needs a lot of rework. | ||
} | ||
|
||
jar { | ||
manifest { | ||
attributes 'FMLCorePlugin' : 'am2.common.asm.Preloader' | ||
attributes 'FMLCorePluginContainsFMLMod' : 'true' | ||
} | ||
} | ||
|
||
dependencies { | ||
deobfCompile "mezz.jei:jei_${config.mcversion}:${config.jei_version}:api" | ||
runtime "mezz.jei:jei_${config.mcversion}:${config.jei_version}" | ||
// 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 | ||
|
||
// for more info... | ||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
// http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
||
} | ||
|
||
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 | ||
} | ||
|
||
// copy everything else, thats not the mcmod.info | ||
from(sourceSets.main.resources.srcDirs) { | ||
exclude 'mcmod.info' | ||
} | ||
} | ||
|
||
task incrementBuildNumber(dependsOn: 'reobfJar') { | ||
doLast { | ||
config.build_number = (config.build_number.toString().toInteger()) + 1 | ||
configFile.withWriter { | ||
config.toProperties().store(it, "") | ||
} | ||
} | ||
} | ||
|
||
def parseConfig(File config) { | ||
config.withReader { | ||
def prop = new Properties() | ||
prop.load(it) | ||
return (new ConfigSlurper().parse(prop)) | ||
} | ||
} | ||
|
||
jar { | ||
archiveName = "${baseName}-${config.mcversion}-${version}.jar" | ||
} | ||
|
||
defaultTasks 'clean', 'build', 'incrementBuildNumber' | ||
buildscript { | ||
repositories { | ||
jcenter() | ||
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.2-SNAPSHOT' | ||
classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' | ||
} | ||
} | ||
repositories { | ||
maven { | ||
url "http://dvs1.progwml6.com/files/maven" | ||
} | ||
} | ||
apply plugin: 'net.minecraftforge.gradle.forge' | ||
apply plugin: 'com.matthewprenger.cursegradle' | ||
|
||
sourceCompatibility = JavaVersion.VERSION_1_8 | ||
targetCompatibility = JavaVersion.VERSION_1_8 | ||
|
||
ext.configFile = file('build.properties') | ||
ext.config = parseConfig(configFile) | ||
|
||
version = "${config.version}-${config.build_number}" | ||
group= "am2" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
archivesBaseName = "ArsMagica2" | ||
|
||
|
||
minecraft { | ||
version = "1.10.2-12.18.3.2185" | ||
runDir = "run" | ||
replace 'GRADLE:BUILD', config.build_number | ||
replace 'GRADLE:VERSION', config.version | ||
replaceIn 'ArsMagica2.java' | ||
//replace '${version}', project.version | ||
mappings = "snapshot_20161111" //uncomment this line to use newest Forge mappings. Needs a lot of rework. | ||
} | ||
|
||
jar { | ||
manifest { | ||
attributes 'FMLCorePlugin' : 'am2.common.asm.Preloader' | ||
attributes 'FMLCorePluginContainsFMLMod' : 'true' | ||
} | ||
} | ||
|
||
dependencies { | ||
deobfCompile "mezz.jei:jei_${config.mcversion}:${config.jei_version}:api" | ||
runtime "mezz.jei:jei_${config.mcversion}:${config.jei_version}" | ||
// 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 | ||
|
||
// for more info... | ||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
// http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
||
} | ||
|
||
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 | ||
} | ||
|
||
// copy everything else, thats not the mcmod.info | ||
from(sourceSets.main.resources.srcDirs) { | ||
exclude 'mcmod.info' | ||
} | ||
} | ||
|
||
task incrementBuildNumber(dependsOn: 'reobfJar') { | ||
doLast { | ||
config.build_number = (config.build_number.toString().toInteger()) + 1 | ||
configFile.withWriter { | ||
config.toProperties().store(it, "") | ||
} | ||
} | ||
} | ||
|
||
def parseConfig(File config) { | ||
config.withReader { | ||
def prop = new Properties() | ||
prop.load(it) | ||
return (new ConfigSlurper().parse(prop)) | ||
} | ||
} | ||
|
||
jar { | ||
archiveName = "${baseName}-${version}.jar" | ||
} | ||
|
||
defaultTasks 'clean', 'build', 'incrementBuildNumber' |
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,8 +1,8 @@ | ||
# | ||
#Sat Dec 24 21:55:56 PST 2016 | ||
mcmapping=snapshot_20161111 | ||
version=1.5.0 | ||
build_number=15 | ||
jei_version=3.7.8.+ | ||
mcversion=1.10.2 | ||
mod_name=ArsMagica2 | ||
# | ||
#Sat Dec 24 21:55:56 PST 2016 | ||
mcmapping=snapshot_20161111 | ||
version=1.5.0C | ||
build_number=3 | ||
jei_version=3.7.8.+ | ||
mcversion=1.10.2 | ||
mod_name=ArsMagica2 |
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package am2.api.blocks; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import net.minecraft.util.ResourceLocation; | ||
import net.minecraft.util.math.BlockPos; | ||
import net.minecraft.world.World; | ||
|
||
public interface IMultiblock { | ||
ArrayList<List<IMultiblockGroup>> getMultiblockGroups(); | ||
boolean matches(World world, BlockPos pos); | ||
List<IMultiblockGroup> getMatchingGroups(World world, BlockPos startCheckPos); | ||
void addGroup(IMultiblockGroup group, IMultiblockGroup... rest); | ||
int getMinX(); | ||
int getMinY(); | ||
int getMinZ(); | ||
int getMaxX(); | ||
int getMaxY(); | ||
int getMaxZ(); | ||
int getWidth(); | ||
int getLength(); | ||
int getHeight(); | ||
ResourceLocation getID(); | ||
} |
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 |
---|---|---|
@@ -0,0 +1,6 @@ | ||
package am2.api.blocks; | ||
|
||
public interface IMultiblockController { | ||
IMultiblock getMultiblockStructure(); | ||
boolean isStructureValid(); | ||
} |
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package am2.api.blocks; | ||
|
||
import java.util.ArrayList; | ||
|
||
import com.google.common.collect.ImmutableList; | ||
|
||
import net.minecraft.block.state.IBlockState; | ||
import net.minecraft.util.math.BlockPos; | ||
import net.minecraft.world.World; | ||
|
||
public interface IMultiblockGroup { | ||
boolean matches(World world, BlockPos pos); | ||
void addBlock(BlockPos pos); | ||
int getMinX(); | ||
int getMinY(); | ||
int getMinZ(); | ||
int getMaxX(); | ||
int getMaxY(); | ||
int getMaxZ(); | ||
ImmutableList<BlockPos> getPositions(); | ||
ImmutableList<IBlockState> getStates(); | ||
void addState(IBlockState state); | ||
ArrayList<IBlockState> getState(BlockPos pos); | ||
|
||
} |
Oops, something went wrong.