From 701cabeebf68dc72bf1bf5549a2fcfc437c9babc Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Dec 2014 19:37:29 +0800 Subject: [PATCH 1/5] #1363 Two bugs with the new Vibrant Capacitor --- ReleaseNotes.txt | 1 + .../enderio/machine/MachineRecipes.java | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 63a94a0f..0a76b837 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -19,6 +19,7 @@ Bugs - #1348 Item conduits not connecting to tesseracts in receive only mode - #1357 Power Conduits replaced by growing tree's - #1347 Capacitor Bank energy duplication bug. +- #1268 Capacitor bank not honoring input redstone settings. ------------------------------------------------------ Version 2.2.2 diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 0d24f9b3..165e447c 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.skull.BlockEndermanSkull; +import crazypants.enderio.machine.capbank.BlockItemCapBank; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.ConvertOldRecipe; import crazypants.enderio.machine.light.BlockItemElectricLight; @@ -131,18 +132,12 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(still, "eve", "tmt", "efe", 'v', Items.cauldron, 'm', machineChassi, 'e', electricSteel, 'f', Blocks.furnace, 't', basicTank); //capacitor bank - // ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0); - // if(Config.useHardRecipes) { - // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block, 'M', - // machineChassi)); - // } else { - // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "mcm", "crc", "mcm", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block)); - // } - ItemStack capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.SIMPLE)); + + ItemStack capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); - capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); + capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); - capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.VIBRANT)); + capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); From f49facf751c0a297ef9f3e7b94f771e8b051b572 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Dec 2014 19:45:57 +0800 Subject: [PATCH 2/5] #1361 Enlightened Fused Quartz is not blast resistant --- ReleaseNotes.txt | 5 +++-- .../java/crazypants/enderio/material/BlockFusedQuartz.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0a76b837..43aebe81 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -18,8 +18,9 @@ Bugs - #1351 Travel Anchor: Item needs to be added before text is displayed - #1348 Item conduits not connecting to tesseracts in receive only mode - #1357 Power Conduits replaced by growing tree's -- #1347 Capacitor Bank energy duplication bug. -- #1268 Capacitor bank not honoring input redstone settings. +- #1347 Capacitor Bank energy duplication bug +- #1268 Capacitor bank not honoring input redstone settings +- #1361 Enlightened Fused Quartz is not blast resistant ------------------------------------------------------ Version 2.2.2 diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index fb1a8334..ce97e117 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -50,7 +50,7 @@ public class BlockFusedQuartz extends BlockEio { } public boolean connectTo(int otherMeta) { - if (otherMeta == this.ordinal()) { + if (otherMeta == ordinal()) { return true; } @@ -95,8 +95,8 @@ public class BlockFusedQuartz extends BlockEio { @Override public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, 1); - if(meta == 0) { + meta = MathHelper.clamp_int(meta, 0, Type.values().length - 1); + if(meta == Type.FUSED_QUARTZ.ordinal() || meta == Type.ENLIGHTENED_FUSED_QUARTZ.ordinal()) { return 2000; } else { return super.getExplosionResistance(par1Entity); From 7422bcd2c227a27cd9f33ca4e05f8adc374532f4 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Dec 2014 20:44:10 +0800 Subject: [PATCH 3/5] #1339 SAG Mill grinding balls reducing return rate for bonus outputs --- ReleaseNotes.txt | 7 ++++--- .../crazypants/enderio/machine/crusher/TileCrusher.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 43aebe81..078ef0f5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -13,13 +13,14 @@ Changes - Updated implementation of RF API to correctly handle IEnergyReceivers that are not IEnergyHandlers Bugs +- #1268 Capacitor bank not honoring input redstone settings - #1297 EnderLiquidConduit writing excessive warning messages - #1336 Soul Binder - Ghost Block +- #1339 SAG Mill grinding balls reducing return rate for bonus outputs +- #1347 Capacitor Bank energy duplication bug +- #1348 Item conduits not connecting to tesseracts in receive only mode - #1351 Travel Anchor: Item needs to be added before text is displayed -- #1348 Item conduits not connecting to tesseracts in receive only mode - #1357 Power Conduits replaced by growing tree's -- #1347 Capacitor Bank energy duplication bug -- #1268 Capacitor bank not honoring input redstone settings - #1361 Enlightened Fused Quartz is not blast resistant ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java index 43a73225..2f92cda8 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java @@ -101,7 +101,7 @@ public class TileCrusher extends AbstractPoweredTaskEntity { if(gb != null) { useGrindingBall = !CrusherRecipeManager.getInstance().isExcludedFromBallBonus(getRecipeInputs()); if(useGrindingBall) { - res = new PoweredTask(nextRecipe, chance * gb.getChanceMultiplier(), getRecipeInputs()); + res = new PoweredTask(nextRecipe, chance / gb.getChanceMultiplier(), getRecipeInputs()); res.setRequiredEnergy(res.getRequiredEnergy() * gb.getPowerMultiplier()); } else { res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); From 90fd5dcd02de788705dd1f1eaf58807da2bdd02f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Dec 2014 21:26:09 +0800 Subject: [PATCH 4/5] #1333 Sound locator sometimes creates thousands of entities per frame Sound locator entities not being rendered in some cases --- ReleaseNotes.txt | 3 + .../enderio/item/darksteel/SoundDetector.java | 57 ++++--------------- .../enderio/item/darksteel/SoundRenderer.java | 26 ++++----- 3 files changed, 25 insertions(+), 61 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 078ef0f5..60762536 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -15,6 +15,8 @@ Changes Bugs - #1268 Capacitor bank not honoring input redstone settings - #1297 EnderLiquidConduit writing excessive warning messages +- #1333 Sound locator sometimes creates thousands of entities per frame +- Sound locator entities not being rendered in some cases - #1336 Soul Binder - Ghost Block - #1339 SAG Mill grinding balls reducing return rate for bonus outputs - #1347 Capacitor Bank energy duplication bug @@ -22,6 +24,7 @@ Bugs - #1351 Travel Anchor: Item needs to be added before text is displayed - #1357 Power Conduits replaced by growing tree's - #1361 Enlightened Fused Quartz is not blast resistant + ------------------------------------------------------ Version 2.2.2 diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java index b5b19e38..6922ea57 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java @@ -1,58 +1,30 @@ package crazypants.enderio.item.darksteel; -import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.ConcurrentModificationException; -import java.util.HashMap; -import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; -import java.util.Map; - -import org.lwjgl.opengl.GL11; +import java.util.concurrent.ArrayBlockingQueue; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraftforge.client.event.sound.PlaySoundEvent17; import net.minecraftforge.client.event.sound.PlaySoundSourceEvent; -import net.minecraftforge.client.event.sound.SoundEvent; -import net.minecraftforge.client.event.sound.SoundEvent.SoundSourceEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; import crazypants.util.Util; -import crazypants.vecmath.Camera; -import crazypants.vecmath.Matrix4d; import crazypants.vecmath.Vector3d; -import crazypants.vecmath.ViewFrustum; public class SoundDetector { + private static final int MAX_ENTITIES = 64; + public static SoundDetector instance = new SoundDetector(); - private List soundQueue = new ArrayList(); - - private List sounds = new LinkedList(); + private List sounds; + private ArrayBlockingQueue soundQueue = new ArrayBlockingQueue(MAX_ENTITIES); private Minecraft mc = Minecraft.getMinecraft(); @@ -62,15 +34,15 @@ public class SoundDetector { @SubscribeEvent public void onSound(PlaySoundAtEntityEvent evt) { - if(enabled && evt.entity != null && evt.entity != Minecraft.getMinecraft().thePlayer) { - soundQueue.add(new SoundSource(evt.entity, evt.volume)); + if(enabled && evt.entity != null && evt.entity != Minecraft.getMinecraft().thePlayer && soundQueue.size() < MAX_ENTITIES) { + soundQueue.offer(new SoundSource(evt.entity, evt.volume)); } } @SubscribeEvent public void onSound(PlaySoundSourceEvent evt) { - if(enabled) { - soundQueue.add(new SoundSource(evt.sound.getXPosF(), evt.sound.getYPosF(), evt.sound.getZPosF(), evt.sound.getVolume())); + if(enabled && soundQueue.size() < MAX_ENTITIES) { + soundQueue.offer(new SoundSource(evt.sound.getXPosF(), evt.sound.getYPosF(), evt.sound.getZPosF(), evt.sound.getVolume())); } } @@ -82,9 +54,8 @@ public class SoundDetector { return; } - List tmp = soundQueue; - soundQueue = sounds; - sounds = tmp; + sounds = new ArrayList(MAX_ENTITIES); + soundQueue.drainTo(sounds); try { Vector3d eye = Util.getEyePositionEio(mc.thePlayer); @@ -95,13 +66,9 @@ public class SoundDetector { mc.thePlayer.worldObj.spawnEntityInWorld(new SoundEntity(mc.thePlayer.worldObj, ss.pos, ss.volume)); } } - sounds.clear(); } catch (Exception ex) { - //very small chance of getting an exception here due to non synchronized swapping of the lists - //Just catching and ignoring this is the lesser of the two evils compared to the cost of syncronizing the lists - //TODO: Maybe look at the impact of using atomic references + //Probably not necessary anymore but saftey first! } - } public boolean isEnabled() { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java index 74c1e885..9f7f5d9c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java @@ -1,26 +1,18 @@ package crazypants.enderio.item.darksteel; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.entity.RenderEntity; +import net.minecraft.entity.Entity; + import org.lwjgl.opengl.GL11; import crazypants.enderio.gui.IconEIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.Vector3d; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderEntity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class SoundRenderer extends RenderEntity { + @Override public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { SoundEntity se = ((SoundEntity) entity); @@ -29,8 +21,10 @@ public class SoundRenderer extends RenderEntity { GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - //float alpha = Math.min(1, se.volume) * 0.5f; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + float alpha = 0.5f; GL11.glColor4f(1, 1, 1, alpha); From 0e5f14984aebcaa3e8dd97d9ed365d0a7fc6db2a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 9 Dec 2014 00:16:17 +0800 Subject: [PATCH 5/5] #1366 Powered Spawners don't remain active with chunk loaders --- ReleaseNotes.txt | 1 + .../machine/spawner/BlockPoweredSpawner.java | 41 +++++++++++++++++++ .../machine/spawner/TilePoweredSpawner.java | 13 ++++-- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 60762536..8481386d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -24,6 +24,7 @@ Bugs - #1351 Travel Anchor: Item needs to be added before text is displayed - #1357 Power Conduits replaced by growing tree's - #1361 Enlightened Fused Quartz is not blast resistant +- #1366 Powered Spawners don't remain active with chunk loaders ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 8d5bf40c..548c4151 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -1,10 +1,13 @@ package crazypants.enderio.machine.spawner; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import net.minecraft.block.BlockMobSpawner; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,6 +19,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; import cpw.mods.fml.common.FMLCommonHandler; @@ -23,10 +27,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; @@ -68,6 +74,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock dropQueue = new ArrayList(); private final List toolBlackList = new ArrayList(); + private Field fieldpersistenceRequired; + protected BlockPoweredSpawner() { super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); @@ -93,6 +103,12 @@ public class BlockPoweredSpawner extends AbstractMachineBlock 1200) { //after two minutes stop forcing it to be around + try { + fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } catch (Exception e) { + Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } + } + } + public boolean isBlackListed(String entityId) { return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 22c2368c..4f51421b 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -73,7 +73,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { if(getStackInSlot(0) == null || getStackInSlot(1) != null) { return; } - Entity ent = logic.createEntity(); + Entity ent = logic.createEntity(false); if(ent == null) { return; } @@ -340,7 +340,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { for (int i = 0; i < spawnCount; ++i) { - Entity entity = createEntity(); + Entity entity = createEntity(true); if(entity == null) { return; } @@ -375,8 +375,13 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { } } - Entity createEntity() { - return EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); + Entity createEntity(boolean forceAlive) { + Entity ent = EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); + if(forceAlive && MIN_PLAYER_DISTANCE <= 0 && ent instanceof EntityLiving) { + ent.getEntityData().setLong(BlockPoweredSpawner.KEY_SPAWNED_BY_POWERED_SPAWNER, getSpawnerWorld().getTotalWorldTime()); + ((EntityLiving) ent).func_110163_bv(); + } + return ent; } void resetTimer() {