diff --git a/build.gradle b/build.gradle index 1fe624d..f6eb03a 100755 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,4 @@ import org.apache.tools.ant.filters.ReplaceTokens -import groovy.xml.MarkupBuilder - -import java.text.SimpleDateFormat buildscript { repositories { @@ -100,7 +97,6 @@ processResources { //redo task if any of these properties change inputs.property "version", project.version inputs.property "mc.version", config.mc.version - inputs.property "ccl.version", config.ccl.version // Replace properties in all files from(sourceSets.main.resources.srcDirs) { @@ -120,6 +116,7 @@ processResources { } } +compileScala.dependsOn updateVersion task deobfJar(type: Jar) { from sourceSets.main.output @@ -147,57 +144,16 @@ jar { classifier = 'universal' } -def deployMetaFile() -{ - new File(new File(project.projectDir, "build/libs/"), - "deploymeta-${project.minecraft.version}-${project.version}.xml") -} - -def createDeployMeta() -{ - def writer = new StringWriter() - def xml = new MarkupBuilder(writer) - - def today = new SimpleDateFormat('dd-MM-yyyy').format(new Date()) - - xml.deployMeta() { - modversion(version) - - date(today) - - deps { - Minecraft(project.minecraft.version) - Forge(config.forge.version) - MrTJPCore(config.mrtjp.version) - CCL(config.ccl.version) - } - - isPublic(true) - - isRecommended(false) - } - - def file = deployMetaFile() - - def stream = new FileOutputStream(file) - stream.write(writer.toString().getBytes()) - stream.flush() - stream.close() -} - artifacts { archives deobfJar archives sourceJar archives apiJar - archives deployMetaFile() } uploadArchives { dependsOn 'reobf' - doFirst {createDeployMeta()} repositories { - if (project.hasProperty("mavenurl")) - { + if (project.hasProperty("mavenurl")) { mavenDeployer { configuration = configurations.deployerJars @@ -248,8 +204,7 @@ uploadArchives { } } -if (project.hasProperty('curseapi')) -{ +if (project.hasProperty('curseapi')) { curse { projectId = '232075' apiKey = project.curseapi diff --git a/resources/mcmod.info b/resources/mcmod.info index 9f21b82..6049d22 100755 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -12,7 +12,7 @@ "screenshots": [], "requiredMods": ["MrTJPCoreMod"], "dependencies": [], - "dependants" : ["RelocationFMP"], + "dependants" : [], "useDependencyInformation": true } ] \ No newline at end of file diff --git a/src/mrtjp/mcframes/api/package-info.java b/src/mrtjp/mcframes/api/package-info.java new file mode 100644 index 0000000..f48b4dd --- /dev/null +++ b/src/mrtjp/mcframes/api/package-info.java @@ -0,0 +1,10 @@ +/* + * Copyright (c) 2015. + * Created by MrTJP. + * All rights reserved. + */ + +//@API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "@VERSION@.@BUILD_NUMBER@") +package mrtjp.mcframes.api; + +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/mrtjp/mcframes/frame.scala b/src/mrtjp/mcframes/frame.scala index eb91f4c..032fffd 100755 --- a/src/mrtjp/mcframes/frame.scala +++ b/src/mrtjp/mcframes/frame.scala @@ -102,11 +102,8 @@ object RenderFrame extends ISimpleBlockRenderingHandler "/assets/mcframes/obj/"+name+".obj").openStream(), 7, InvertX).values()) - m.shrinkUVs(0.0005) m.apply(new Scale(1.00075, 1.00075, 1.00075)) m.apply(new Translation(Vector3.center)) - m.computeNormals - m.computeLighting(LightModel.standardLightModel) m } @@ -168,7 +165,7 @@ object RenderFrame extends ISimpleBlockRenderingHandler var m = models(mask&0x3F) if (m == null) { - m = combine(Seq(model, FrameModelGen.generate(mask))) + m = FrameModelGen.generate(model, mask) models(mask&0x3F) = m } m @@ -183,7 +180,7 @@ object FrameModelGen val u = 0.5 val v = 0.5 - def generate(mask:Int) = + def generate(box:CCModel, mask:Int) = { var m = generateSinglePeg m = generateQuartRotated(m) @@ -191,6 +188,7 @@ object FrameModelGen m = generateBackface(m) var b = Seq.newBuilder[CCModel] + b += box for (s <- 0 until 6) if ((mask&1<