etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to 1.8.8

This commit is contained in:
Adubbz 2015-12-15 19:36:54 +11:00
parent d26a72544c
commit 313ea7f562
24 changed files with 191 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
build.gradle
View File

@ -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' }
}
}
}
}
}
}
}

4
build.properties
View File

@ -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

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

26
src/main/java/biomesoplenty/api/biome/BOPBiome.java
View File

@ -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 <? extends Entity > entityClazz = null;
Class <? extends EntityLiving> entityClazz = null;
for (Object entry : EntityList.stringToClassMapping.entrySet())
{
String entryEntityName = (String)((Entry)entry).getKey();
if (entryEntityName.equalsIgnoreCase(entityName))
{
entityClazz = (Class <? extends Entity >)((Entry)entry).getValue();
entityClazz = (Class <? extends EntityLiving>)((Entry)entry).getValue();
}
}
if (entityClazz == null)

18
src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java
View File

@ -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);

1
src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java
View File

@ -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;

6
src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java
View File

@ -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)

13
src/main/java/biomesoplenty/client/particle/EntityTrailFX.java
View File

@ -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

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java
View File

@ -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);
}

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java
View File

@ -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;
}
}

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java
View File

@ -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;
}

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java
View File

@ -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;
}
}

4
src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java
View File

@ -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;

10
src/main/java/biomesoplenty/common/command/BOPCommand.java
View File

@ -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());
}
}

13
src/main/java/biomesoplenty/common/entities/RenderPixie.java
View File

@ -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<EntityPixie>
{
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();
}
}

31
src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java
View File

@ -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();
}

3
src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java
View File

@ -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);

2
src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java
View File

@ -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();
}

3
src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java
View File

@ -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;
}
}

4
src/main/java/biomesoplenty/common/util/block/VariantPagingHelper.java
View File

@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
public class VariantPagingHelper<B extends Block, V extends Comparable & IStringSerializable & VariantPagingHelper.IPagedVariants>
public class VariantPagingHelper<B extends Block, V extends Enum<V> & IStringSerializable & VariantPagingHelper.IPagedVariants>
{
public interface IPagedVariants
@ -107,7 +107,7 @@ public class VariantPagingHelper<B extends Block, V extends Comparable & IString
this.variantToPageIndex.put(variant, new PageIndex(pageNum, index));
this.masterIndexToVariant.put(Integer.valueOf(pageNum * this.variantsPerPage + index), variant);
}
this.pageNumToProperty.put(Integer.valueOf(pageNum), PropertyEnum.create("variant", this.variantsEnumClass, variants) );
this.pageNumToProperty.put(Integer.valueOf(pageNum), PropertyEnum.create("variant", this.variantsEnumClass, variants));
}
public void addBlock(int pageNum, B block)

36
src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java
View File

@ -138,31 +138,31 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
// add structures
if (this.settings.useCaves)
{
this.caveGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.caveGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useRavines)
{
this.ravineGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.ravineGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.mineshaftGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
this.villageGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.villageGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.strongholdGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.scatteredFeatureGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175792_a(this, this.worldObj, chunkX, chunkZ, chunkprimer);
this.oceanMonumentGenerator.generate(this, this.worldObj, chunkX, chunkZ, chunkprimer);
}
// create and return the chunk
@ -480,23 +480,23 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
// populate the structures
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.mineshaftGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
hasVillageGenerated = this.villageGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
hasVillageGenerated = this.villageGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.strongholdGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.scatteredFeatureGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.oceanMonumentGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
BlockPos decorateStart = blockpos.add(8, 0, 8);
@ -575,7 +575,7 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
if (this.settings.useMonuments && this.mapFeaturesEnabled && p_177460_2_.getInhabitedTime() < 3600L)
{
flag |= this.oceanMonumentGenerator.func_175794_a(this.worldObj, this.rand, new ChunkCoordIntPair(p_177460_3_, p_177460_4_));
flag |= this.oceanMonumentGenerator.generateStructure(this.worldObj, this.rand, new ChunkCoordIntPair(p_177460_3_, p_177460_4_));
}
return flag;
@ -646,27 +646,27 @@ public class ChunkProviderGenerateBOP implements IChunkProvider
{
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.mineshaftGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
this.villageGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.villageGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.strongholdGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.scatteredFeatureGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.oceanMonumentGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
}

38
src/main/java/biomesoplenty/common/world/ChunkProviderGenerateVanilla.java
View File

@ -107,7 +107,7 @@ public class ChunkProviderGenerateVanilla implements IChunkProvider
if (p_i45636_5_ != null)
{
this.settings = ChunkProviderSettings.Factory.func_177865_a(p_i45636_5_).func_177864_b();
this.settings = ChunkProviderSettings.Factory.jsonToFactory(p_i45636_5_).func_177864_b();
this.seaBlock = this.settings.useLavaOceans ? Blocks.lava : Blocks.water;
}
@ -221,37 +221,37 @@ public class ChunkProviderGenerateVanilla implements IChunkProvider
if (this.settings.useCaves)
{
this.caveGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.caveGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useRavines)
{
this.ravineGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.ravineGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.mineshaftGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
this.villageGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.villageGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.strongholdGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.scatteredFeatureGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175792_a(this, this.worldObj, x, z, chunkprimer);
this.oceanMonumentGenerator.generate(this, this.worldObj, x, z, chunkprimer);
}
Chunk chunk = new Chunk(this.worldObj, chunkprimer, x, z);
@ -461,27 +461,27 @@ public class ChunkProviderGenerateVanilla implements IChunkProvider
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.mineshaftGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
flag = this.villageGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
flag = this.villageGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.strongholdGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.scatteredFeatureGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175794_a(this.worldObj, this.rand, chunkcoordintpair);
this.oceanMonumentGenerator.generateStructure(this.worldObj, this.rand, chunkcoordintpair);
}
int k1;
@ -560,7 +560,7 @@ public class ChunkProviderGenerateVanilla implements IChunkProvider
if (this.settings.useMonuments && this.mapFeaturesEnabled && p_177460_2_.getInhabitedTime() < 3600L)
{
flag |= this.oceanMonumentGenerator.func_175794_a(this.worldObj, this.rand, new ChunkCoordIntPair(p_177460_3_, p_177460_4_));
flag |= this.oceanMonumentGenerator.generateStructure(this.worldObj, this.rand, new ChunkCoordIntPair(p_177460_3_, p_177460_4_));
}
return flag;
@ -631,27 +631,27 @@ public class ChunkProviderGenerateVanilla implements IChunkProvider
{
if (this.settings.useMineShafts && this.mapFeaturesEnabled)
{
this.mineshaftGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.mineshaftGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useVillages && this.mapFeaturesEnabled)
{
this.villageGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.villageGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useStrongholds && this.mapFeaturesEnabled)
{
this.strongholdGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.strongholdGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useTemples && this.mapFeaturesEnabled)
{
this.scatteredFeatureGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.scatteredFeatureGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
if (this.settings.useMonuments && this.mapFeaturesEnabled)
{
this.oceanMonumentGenerator.func_175792_a(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
this.oceanMonumentGenerator.generate(this, this.worldObj, p_180514_2_, p_180514_3_, (ChunkPrimer)null);
}
}

2
src/main/java/biomesoplenty/core/ClientProxy.java
View File

@ -89,7 +89,7 @@ public class ClientProxy extends CommonProxy
if (nonRenderingProperties != null)
{
// use a custom state mapper which will ignore the properties specified in the block as being non-rendering
IStateMapper custom_mapper = (new StateMap.Builder()).addPropertiesToIgnore(nonRenderingProperties).build();
IStateMapper custom_mapper = (new StateMap.Builder()).ignore(nonRenderingProperties).build();
ModelLoader.setCustomStateMapper(block, custom_mapper);
}
}