diff --git a/build.gradle b/build.gradle index d7d2b6072..3d2d00440 100644 --- a/build.gradle +++ b/build.gradle @@ -1,29 +1,18 @@ buildscript { repositories { - mavenCentral() + jcenter() maven { - name = 'sonatype-nexus-public' - url = 'https://oss.sonatype.org/content/repositories/public/' - } - maven { - name = 'forge-repo' - url = 'http://files.minecraftforge.net/maven/' + name = "forge" + url = "http://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } -apply plugin: "forge" -apply plugin: "curseforge" - -repositories { - flatDir { - name "fileRepo" - dirs "repo" - } -} +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'maven' // define the properties file ext.configFile = file "build.properties" @@ -41,23 +30,12 @@ archivesBaseName = "BiomesOPlenty" minecraft { version = config.minecraft_version + "-" + config.forge_version // grab latest forge - mappings = "snapshot_nodoc_20150214" + mappings = "snapshot_nodoc_20151214" } // add some stuff to the version version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}" -jenkins { - job = 'BiomesOPlenty' -} - -// Source compiler configuration -tasks.withType(JavaCompile) { - //options.compilerArgs += [ '-Xlint:all', '-Xlint:-path', '-Xlint:-processing' ] - //options.deprecation = true - options.encoding = 'utf8' -} - def commonManifest = { attributes 'FMLCorePlugin': 'biomesoplenty.common.asm.BOPLoadingPlugin' attributes 'FMLCorePluginContainsFMLMod': 'true' @@ -90,47 +68,23 @@ processResources { } } -import net.minecraftforge.gradle.tasks.dev.ChangelogTask +import net.minecraftforge.gradle.tasks.JenkinsChangelog import net.minecraftforge.gradle.common.Constants -import net.minecraftforge.gradle.delayed.* -task createChangelog(type: ChangelogTask) { - def jobName = "${System.getenv().JOB_NAME}" +task createChangelog(type: JenkinsChangelog) { def buildNumber = "${System.getenv().BUILD_NUMBER}" - setServerRoot(new DelayedString(project, 'http://ci.jenkins.minecraftforge.net/')) - setJobName(new DelayedString(project, jobName.toString())); - setAuthName(new DelayedString(project, 'console_script')); - setAuthPassword(new DelayedString(project, 'dc6d48ca20a474beeac280a9a16a926e')); - setTargetBuild({buildNumber.toString()}); - setOutput(new DelayedFile(project, 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt')); -} - -def curseChangelog - -task createCurseChangelog { - def env = System.getenv() - def jenkinsUrl = env.JENKINS_URL - def jenkinsJob = env.JOB_NAME - def buildNumber = env.BUILD_NUMBER - - if (jenkinsUrl != null && jenkinsJob != null && buildNumber != null) { - def auth = "console_script:dc6d48ca20a474beeac280a9a16a926e".getBytes().encodeBase64().toString() - def url = new URL("$jenkinsUrl/job/$jenkinsJob/$buildNumber/api/xml?depth=20").openConnection() - url.setRequestProperty("Authorization", "Basic " + auth) - String data = url.getInputStream().text - - def xml = new XmlSlurper().parseText(data) - - xml.changeSet.item.each { change -> - curseChangelog += "$change.author.fullName: $change.msg" + '\n' - } - } + serverRoot = 'http://ci.jenkins.minecraftforge.net/' + jobName = 'BiomesOPlenty' + authName = 'console_script'; + authPassword = 'dc6d48ca20a474beeac280a9a16a926e'; + targetBuild = buildNumber.toString(); + output = 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt'; } tasks.build.dependsOn('createChangelog') -task sourceJar(type: Jar) { +task sourcesJar(type: Jar) { from sourceSets.main.allJava from (sourceSets.main.output) { include 'LICENSE.txt' @@ -147,97 +101,79 @@ task deobfJar(type: Jar) { } artifacts { - archives sourceJar + archives sourcesJar archives deobfJar } -curse { - dependsOn "createCurseChangelog" - - projectId = project.config.curse_project_id - apiKey = "$System.env.curse_api_key" - changelog = curseChangelog - releaseType = project.config.curse_release_type - - additionalArtifact deobfJar - additionalArtifact sourceJar -} - uploadArchives { - dependsOn 'reobf' + dependsOn 'build' - repositories { + repositories.mavenDeployer { if ("$System.env.maven_username" != "null" && "$System.env.maven_password" != "null") { - logger.info('Publishing to files server') + logger.info('Publishing to files server') - mavenDeployer { - configuration = configurations.deployJars - - repository(url: project.filesmaven.url) { - authentication(userName: "$System.env.maven_username", privateKey: "$System.env.maven_password") - } - - pom { - groupId = project.group - version = project.version - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging 'jar' - description 'Biomes O Plenty' - url 'https://github.com/Glitchfiend/BiomesOPlenty' - - scm { - url 'https://github.com/Glitchfiend/BiomesOPlenty' - connection 'scm:git:git://github.com/Glitchfiend/BiomesOPlenty.git' - developerConnection 'scm:git:git@github.com:Glitchfiend/BiomesOPlenty.git' - } - - issueManagement { - system 'github' - url 'https://github.com/Glitchfiend/BiomesOPlenty/issues' - } - - licenses { - license { - name 'Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International Public License' - url 'http://creativecommons.org/licenses/by-nc-nd/4.0/' - distribution 'repo' - } - } - - developers { - developer { - id 'Adubbz' - name 'Adubbz' - roles { role 'developer' } - } - developer { - id 'Amnet' - name 'Amnet' - roles { role 'developer' } - } - developer { - id 'Forstride' - name 'Forstride' - roles { role 'developer' } - } - developer { - id 'ted80' - name 'ted80' - roles { role 'developer' } - } - } - } - } + repository(url: "http://files.minecraftforge.net/maven/manage/upload") { + authentication(userName: "$System.env.maven_username", privateKey: "$System.env.maven_password") } } else { logger.info('Publishing to repo folder') - mavenDeployer { - pom.version = "${project.minecraft.version}-${project.version}" - repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) + pom.version = "${project.minecraft.version}-${project.version}" + repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) + } + + pom { + groupId = project.group + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'Biomes O Plenty' + url 'https://github.com/Glitchfiend/BiomesOPlenty' + + scm { + url 'https://github.com/Glitchfiend/BiomesOPlenty' + connection 'scm:git:git://github.com/Glitchfiend/BiomesOPlenty.git' + developerConnection 'scm:git:git@github.com:Glitchfiend/BiomesOPlenty.git' + } + + issueManagement { + system 'github' + url 'https://github.com/Glitchfiend/BiomesOPlenty/issues' + } + + licenses { + license { + name 'Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International Public License' + url 'http://creativecommons.org/licenses/by-nc-nd/4.0/' + distribution 'repo' + } + } + + developers { + developer { + id 'Adubbz' + name 'Adubbz' + roles { role 'developer' } + } + developer { + id 'Amnet' + name 'Amnet' + roles { role 'developer' } + } + developer { + id 'Forstride' + name 'Forstride' + roles { role 'developer' } + } + developer { + id 'ted80' + name 'ted80' + roles { role 'developer' } + } + } } } } -} +} \ No newline at end of file diff --git a/build.properties b/build.properties index 7d18de9ca..069bfe189 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ -minecraft_version=1.8 -forge_version=11.14.3.1502 +minecraft_version=1.8.8 +forge_version=11.15.0.1628-1.8.8 mod_version=3.0.0 curse_project_id=220318 curse_release_type=alpha diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b76121670..30d399d8d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8de..9397848f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiome.java b/src/main/java/biomesoplenty/api/biome/BOPBiome.java index 4ce445891..08d769048 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiome.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiome.java @@ -13,19 +13,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Map.Entry; +import java.util.Random; -import net.minecraft.block.BlockSand; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.generation.GenerationManager; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.IGenerator; @@ -33,6 +23,16 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.TerrainSettings; +import net.minecraft.block.BlockSand; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.ChunkPrimer; public class BOPBiome extends BiomeGenBase implements IExtendedBiome { @@ -132,13 +132,13 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome // Look for an entity class matching this name // case insensitive, dot used as mod delimiter, no spaces or underscores // eg 'villager', 'Zombie', 'SQUID', 'enderdragon', 'biomesoplenty.wasp' all ok - Class entityClazz = null; + Class entityClazz = null; for (Object entry : EntityList.stringToClassMapping.entrySet()) { String entryEntityName = (String)((Entry)entry).getKey(); if (entryEntityName.equalsIgnoreCase(entityName)) { - entityClazz = (Class )((Entry)entry).getValue(); + entityClazz = (Class )((Entry)entry).getValue(); } } if (entityClazz == null) diff --git a/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java b/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java index 449438021..470c8c94e 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java +++ b/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java @@ -12,6 +12,7 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -249,9 +250,9 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH @Override - public String func_175318_a(int p_175318_1_, String p_175318_2_, float p_175318_3_) + public String getText(int id, String name, float value) { - return p_175318_2_ + ": " + this.stringFormatFloat(p_175318_1_, p_175318_3_); + return name + ": " + this.stringFormatFloat(id, value); } private String stringFormatFloat(int fieldId, float value) @@ -361,7 +362,7 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH @Override public void func_175319_a(int fieldId, String value) {this.handleStringSelection(fieldId, value);} @Override - public void func_175320_a(int fieldId, float value) {this.handleFloatSelection(fieldId, value);} + public void onTick(int fieldId, float value) {this.handleFloatSelection(fieldId, value);} @Override public void func_175321_a(int fieldId, boolean value) {this.handleBooleanSelection(fieldId, value);} @@ -544,12 +545,11 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH WorldRenderer worldrenderer = tessellator.getWorldRenderer(); this.mc.getTextureManager().bindTexture(optionsBackground); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - worldrenderer.startDrawingQuads(); - worldrenderer.setColorOpaque_I(4210752); - worldrenderer.addVertexWithUV((double)(this.width / 2 - 90), 185.0D, 0.0D, 0.0D, 2.65625D); - worldrenderer.addVertexWithUV((double)(this.width / 2 + 90), 185.0D, 0.0D, 5.625D, 2.65625D); - worldrenderer.addVertexWithUV((double)(this.width / 2 + 90), 100.0D, 0.0D, 5.625D, 0.0D); - worldrenderer.addVertexWithUV((double)(this.width / 2 - 90), 100.0D, 0.0D, 0.0D, 0.0D); + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.pos((double)(this.width / 2 - 90), 185.0D, 0.0D).tex(0.0D, 2.65625D).color(64, 64, 64, 64).endVertex(); + worldrenderer.pos((double)(this.width / 2 + 90), 185.0D, 0.0D).tex(5.625D, 2.65625D).color(64, 64, 64, 64).endVertex(); + worldrenderer.pos((double)(this.width / 2 + 90), 100.0D, 0.0D).tex(5.625D, 0.0D).color(64, 64, 64, 64).endVertex(); + worldrenderer.pos((double)(this.width / 2 - 90), 100.0D, 0.0D).tex(0.0D, 0.0D).color(64, 64, 64, 64).endVertex(); tessellator.draw(); this.drawCenteredString(this.fontRendererObj, I18n.format("createWorld.customize.custom.confirmTitle", new Object[0]), this.width / 2, 105, 16777215); this.drawCenteredString(this.fontRendererObj, I18n.format("createWorld.customize.custom.confirm1", new Object[0]), this.width / 2, 125, 16777215); diff --git a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java index f5d99f517..2afb81f22 100644 --- a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java +++ b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java @@ -17,6 +17,7 @@ import biomesoplenty.client.util.TextureUtils; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.resources.model.SimpleBakedModel; import net.minecraft.util.IRegistry; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java b/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java index b5afe138b..0bf139c47 100644 --- a/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java +++ b/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java @@ -32,12 +32,6 @@ public class ModelBiomeFinder extends IFlexibleBakedModel.Wrapper implements ISm this.defaultModel = defaultModel; this.frames = ModelUtils.generateModelsForTextures(defaultModel, frameTextures); } - - @Override - public TextureAtlasSprite getTexture() - { - return null; - } @Override public IBakedModel handleItemState(ItemStack stack) diff --git a/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java b/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java index ea0f14402..abc3dea75 100644 --- a/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java +++ b/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java @@ -53,11 +53,14 @@ public class EntityTrailFX extends EntityFX float y = (float)(prevPosY + (posY - prevPosY) - interpPosY); float z = (float)(prevPosZ + (posZ - prevPosZ) - interpPosZ); - renderer.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, alpha); - renderer.addVertexWithUV(x - width, y, z + width, minU, maxV); - renderer.addVertexWithUV(x + width, y, z + width, minU, minV); - renderer.addVertexWithUV(x + width, y, z - width, maxU, minV); - renderer.addVertexWithUV(x - width, y, z - width, maxU, maxV); + int i = this.getBrightnessForRender(partialTicks); + int j = i >> 16 & 65535; + int k = i & 65535; + + renderer.pos(x - width, y, z + width).tex(minU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex(); + renderer.pos(x + width, y, z + width).tex(minU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex(); + renderer.pos(x + width, y, z - width).tex(maxU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex(); + renderer.pos(x - width, y, z - width).tex(maxU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex(); } @Override diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index 8fd16be13..8ca681f99 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -116,14 +116,14 @@ public class BiomeGenBambooForest extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.7D ? 0xD4DB55 : (noise < -0.3D ? 0xBBDD54 : 0xA3E053); } @Override public int getFoliageColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.7D ? 0xD4DB55 : (noise < -0.3D ? 0xBBDD54 : 0xA3E053); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java index fd7e16485..cd57f0565 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java @@ -76,14 +76,14 @@ public class BiomeGenDeciduousForest extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 0xC1B749 : 0xAD8E41; } @Override public int getFoliageColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 0xC4C93A : 0xAFA248; } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index e0852ab9a..ff027baaf 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -84,14 +84,14 @@ public class BiomeGenGrove extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 0x517F51 : 0x609E58; } @Override public int getFoliageColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 0x619961 : 0x75B569; } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index efefc35f6..9be737c91 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -57,14 +57,14 @@ public class BiomeGenSteppe extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 13214328 : 12885629; } @Override public int getFoliageColorAtPos(BlockPos pos) { - double noise = field_180281_af.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double noise = GRASS_COLOR_NOISE.func_151601_a((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return noise < -0.1D ? 13214328 : 12885629; } } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java index 9c92d94b8..c74d7f814 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java @@ -15,6 +15,7 @@ import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockPlanks; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; @@ -50,7 +51,8 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock public BlockBOPFenceGate(BOPWoods wood) { - super(); + super(BlockPlanks.EnumType.OAK); + this.setHarvestLevel("axe", 0); this.wood = wood; diff --git a/src/main/java/biomesoplenty/common/command/BOPCommand.java b/src/main/java/biomesoplenty/common/command/BOPCommand.java index 1bc0a70a4..2af416cb9 100644 --- a/src/main/java/biomesoplenty/common/command/BOPCommand.java +++ b/src/main/java/biomesoplenty/common/command/BOPCommand.java @@ -137,7 +137,7 @@ public class BOPCommand extends CommandBase double z = (double)closestBiomePos.getZ(); player.playerNetServerHandler.setPlayerLocation(x, y, z, player.rotationYaw, player.rotationPitch); - sender.addChatMessage(new ChatComponentTranslation("commands.biomesoplenty.tpbiome.success", player.getCommandSenderName(), biomeToFind.biomeName, x, y, z)); + sender.addChatMessage(new ChatComponentTranslation("commands.biomesoplenty.tpbiome.success", player.getName(), biomeToFind.biomeName, x, y, z)); } else { @@ -249,12 +249,4 @@ public class BOPCommand extends CommandBase return null; } - - //This is apparently causing a compile error on Jenkins for some unknown reason - //Nontheless, this fixes it - @Override - public int compareTo(Object object) - { - return this.getCommandName().compareTo(((ICommand)object).getCommandName()); - } } diff --git a/src/main/java/biomesoplenty/common/entities/RenderPixie.java b/src/main/java/biomesoplenty/common/entities/RenderPixie.java index 6b1c62e00..1d646577a 100644 --- a/src/main/java/biomesoplenty/common/entities/RenderPixie.java +++ b/src/main/java/biomesoplenty/common/entities/RenderPixie.java @@ -1,16 +1,15 @@ package biomesoplenty.common.entities; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; @SideOnly(Side.CLIENT) -public class RenderPixie extends RenderLiving +public class RenderPixie extends RenderLiving { private static final ResourceLocation pixieTextureLocation = new ResourceLocation("biomesoplenty:textures/entity/pixie.png"); @@ -22,7 +21,7 @@ public class RenderPixie extends RenderLiving } @Override - protected ResourceLocation getEntityTexture(Entity entity) + protected ResourceLocation getEntityTexture(EntityPixie entity) { return pixieTextureLocation; } @@ -31,7 +30,7 @@ public class RenderPixie extends RenderLiving // Looks like the idea is to set some rendering functions, then call super.doRender, then go back to normal // LayerEndermanEyes have the same kind of approach I think @Override - public void doRender(Entity entity, double x, double y, double z, float entityYaw, float partialTicks) + public void doRender(EntityPixie entity, double x, double y, double z, float entityYaw, float partialTicks) { GlStateManager.enableBlend(); GlStateManager.disableAlpha(); @@ -50,5 +49,5 @@ public class RenderPixie extends RenderLiving GlStateManager.disableBlend(); GlStateManager.enableAlpha(); } - + } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java b/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java index 1db047527..fb62aceda 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -70,19 +71,19 @@ public class RenderDart extends Render GlStateManager.translate(-4.0F, 0.0F, 0.0F); GL11.glNormal3f(scale, 0.0F, 0.0F); - worldrenderer.startDrawingQuads(); - worldrenderer.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)flights_u0, (double)flights_v0); - worldrenderer.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)flights_u1, (double)flights_v0); - worldrenderer.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)flights_u1, (double)flights_v1); - worldrenderer.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)flights_u0, (double)flights_v1); + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)flights_u0, (double)flights_v0).endVertex(); + worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)flights_u1, (double)flights_v0).endVertex();; + worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)flights_u1, (double)flights_v1).endVertex();; + worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)flights_u0, (double)flights_v1).endVertex();; tessellator.draw(); GL11.glNormal3f(-scale, 0.0F, 0.0F); - worldrenderer.startDrawingQuads(); - worldrenderer.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)flights_u0, (double)flights_v0); - worldrenderer.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)flights_u1, (double)flights_v0); - worldrenderer.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)flights_u1, (double)flights_v1); - worldrenderer.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)flights_u0, (double)flights_v1); + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)flights_u0, (double)flights_v0).endVertex();; + worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)flights_u1, (double)flights_v0).endVertex();; + worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)flights_u1, (double)flights_v1).endVertex();; + worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)flights_u0, (double)flights_v1).endVertex();; tessellator.draw(); // render shaft @@ -91,11 +92,11 @@ public class RenderDart extends Render { GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GL11.glNormal3f(0.0F, 0.0F, scale); - worldrenderer.startDrawingQuads(); - worldrenderer.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double)shaft_u0, (double)shaft_v0); - worldrenderer.addVertexWithUV(8.0D, -2.0D, 0.0D, (double)shaft_u1, (double)shaft_v0); - worldrenderer.addVertexWithUV(8.0D, 2.0D, 0.0D, (double)shaft_u1, (double)shaft_v1); - worldrenderer.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double)shaft_u0, (double)shaft_v1); + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)shaft_u0, (double)shaft_v0).endVertex();; + worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)shaft_u1, (double)shaft_v0).endVertex();; + worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)shaft_u1, (double)shaft_v1).endVertex();; + worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex((double)shaft_u0, (double)shaft_v1).endVertex();; tessellator.draw(); } diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java b/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java index 0f0be31e8..da1042188 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java @@ -1,6 +1,7 @@ package biomesoplenty.common.entities.projectiles; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -35,7 +36,7 @@ public class RenderMudball extends Render GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.locationBlocksTexture); - this.renderItem.renderItemModel(this.getItemStack(entity)); + this.renderItem.func_181564_a(this.getItemStack(entity), ItemCameraTransforms.TransformType.GROUND); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); super.doRender(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java index 8c922e206..787140b93 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java @@ -70,7 +70,7 @@ public class ItemBOPSpawnEgg extends Item entity.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(worldIn.rand.nextFloat() * 360.0F), 0.0F); entityliving.rotationYawHead = entityliving.rotationYaw; entityliving.renderYawOffset = entityliving.rotationYaw; - entityliving.onSpawnFirstTime(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); worldIn.spawnEntityInWorld(entity); entityliving.playLivingSound(); } diff --git a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java index 945c11cc8..36fb07608 100644 --- a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java +++ b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java @@ -22,7 +22,6 @@ import net.minecraft.world.gen.ChunkProviderSettings; public class BiomeUtils { - public static int getBiomeSize(World world) { String generatorSettingsJson = world.getWorldInfo().getGeneratorOptions(); @@ -32,7 +31,7 @@ public class BiomeUtils } else { - return ChunkProviderSettings.Factory.func_177865_a(generatorSettingsJson).func_177864_b().biomeSize; + return ChunkProviderSettings.Factory.jsonToFactory(generatorSettingsJson).func_177864_b().biomeSize; } } diff --git a/src/main/java/biomesoplenty/common/util/block/VariantPagingHelper.java b/src/main/java/biomesoplenty/common/util/block/VariantPagingHelper.java index 0a3a52b81..ea0f1127b 100644 --- a/src/main/java/biomesoplenty/common/util/block/VariantPagingHelper.java +++ b/src/main/java/biomesoplenty/common/util/block/VariantPagingHelper.java @@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; -public class VariantPagingHelper +public class VariantPagingHelper & IStringSerializable & VariantPagingHelper.IPagedVariants> { public interface IPagedVariants @@ -107,7 +107,7 @@ public class VariantPagingHelper