Compare commits

..
4 Commits
6 changed files with 19 additions and 27 deletions

No files matched your search

@@ -573,7 +573,7 @@ public class Bee extends IndividualLiving implements IBee {
}
// / Secondary Products
for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances().entrySet()) {
if (housing.getWorld().rand.nextFloat() < getFinalChance(entry.getValue() / 2, speed, prodModifier, 1f)) {
if (housing.getWorld().rand.nextFloat() < getFinalChance(entry.getValue() / 2f, speed, prodModifier, 1f)) {
products.add(entry.getKey().copy());
}
}
@@ -95,8 +95,7 @@ public class TileWood extends TileEntity implements IStreamable {
EnumWoodType woodType = wood.getWoodType();
int amount = 1;
if (block instanceof BlockSlab) {
BlockSlab blockSlab = (BlockSlab) block;
if (block instanceof BlockSlab blockSlab) {
if (blockSlab.isDoubleSlab()) {
amount = 2;
block = PluginArboriculture.blocks.slabs;
@@ -104,6 +103,7 @@ public class TileWood extends TileEntity implements IStreamable {
}
ItemStack itemStack = new ItemStack(block, amount);
if (itemStack.getItem() == null) return null;
ItemBlockWood.saveToItemStack(woodType, itemStack);
return itemStack;
}
@@ -60,8 +60,6 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR
private void render(ItemStack itemstack, World world, ForgeDirection orientation, double x, double y, double z) {
dummyEntityItem.worldObj = world;
model.render(orientation, (float) x, (float) y, (float) z);
if (itemstack == null) {
return;
@@ -72,13 +70,18 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR
GL11.glTranslatef((float) x, (float) y, (float) z);
GL11.glTranslatef(0.5f, 0.2f, 0.5f);
GL11.glScalef(renderScale, renderScale, renderScale);
dummyEntityItem.setEntityItemStack(itemstack);
if (world.getTotalWorldTime() != lastTick) {
lastTick = world.getTotalWorldTime();
dummyEntityItem.onUpdate();
try {
dummyEntityItem.worldObj = world;
dummyEntityItem.setEntityItemStack(itemstack);
if (world.getTotalWorldTime() != lastTick) {
lastTick = world.getTotalWorldTime();
dummyEntityItem.onUpdate();
}
customRenderItem.doRender(dummyEntityItem, 0, 0, 0, 0, 0);
} finally {
dummyEntityItem.worldObj = null;
}
customRenderItem.doRender(dummyEntityItem, 0, 0, 0, 0, 0);
GL11.glPopMatrix();
}
}
@@ -22,8 +22,6 @@ import forestry.core.tiles.TileMill;
public class RenderMill extends TileEntitySpecialRenderer implements IBlockRenderer {
private final ModelBase model = new ModelBase() {};
private enum Textures {
PEDESTAL,
EXTENSION,
@@ -41,6 +39,7 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende
private final ModelRenderer blade2;
public RenderMill() {
ModelBase model = new ModelBase() {};
pedestal = new ModelRenderer(model, 0, 0);
pedestal.addBox(-8F, -8F, -8F, 16, 1, 16);
pedestal.rotationPointX = 8;
@@ -307,8 +307,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
size = genome.getSize();
setSize(size, 0.4f);
species = genome.getPrimary();
if (!worldObj.isRemote) {
if (worldObj != null && !worldObj.isRemote) {
dataWatcher.updateObject(DATAWATCHER_ID_SIZE, (int) (size * 100));
dataWatcher.updateObject(DATAWATCHER_ID_SPECIES, species.getUID());
} else {
@@ -71,20 +71,11 @@ public class RenderButterflyItem implements IItemRenderer {
butterfly = ButterflyManager.butterflyRoot
.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate());
}
try {
if (entity == null) {
entity = new EntityButterfly(Proxies.common.getRenderWorld(), butterfly, 0, 0, 0);
} else {
entity.setWorld(Proxies.common.getRenderWorld());
entity.setIndividual(butterfly);
}
} finally {
if (entity != null) {
entity.setWorld(null);
}
if (entity == null) {
entity = new EntityButterfly(null, butterfly, 0, 0, 0);
} else {
entity.setIndividual(butterfly);
}
return butterfly;
}