From b62a858a4a59937e01803ff53d30cb7b8ad2fd6c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Jul 2016 22:56:50 -0400 Subject: [PATCH 01/16] Fix rendering crashes --- .../java/mekanism/client/render/MekanismRenderer.java | 9 +++++++-- .../client/render/transmitter/RenderMechanicalPipe.java | 1 - .../client/render/transmitter/RenderPressurizedTube.java | 1 - .../render/transmitter/RenderThermodynamicConductor.java | 1 - .../client/render/transmitter/RenderTransmitterBase.java | 5 +---- .../client/render/transmitter/RenderUniversalCable.java | 1 - 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 221d99dee..895b09439 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -225,9 +225,14 @@ public class MekanismRenderer return map.containsKey(fluid) ? map.get(fluid) : missingIcon; } - public static boolean isDrawing(Tessellator tessellator) + public static boolean isDrawing(Tessellator tess) { - return (boolean)ReflectionUtils.getPrivateValue(tessellator.getBuffer(), VertexBuffer.class, ObfuscatedNames.VertexBuffer_isDrawing); + return isDrawing(tess.getBuffer()); + } + + public static boolean isDrawing(VertexBuffer buffer) + { + return (boolean)ReflectionUtils.getPrivateValue(buffer, VertexBuffer.class, ObfuscatedNames.VertexBuffer_isDrawing); } public static class Model3D diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index abc00dbe9..e000a0723 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -111,7 +111,6 @@ public class RenderMechanicalPipe extends RenderTransmitterBase extends M GL11.glPopMatrix(); } - public static boolean isDrawing = false; - public void renderTransparency(VertexBuffer renderer, TextureAtlasSprite icon, IBakedModel cc, ColourRGBA color) { - if(!isDrawing) + if(!MekanismRenderer.isDrawing(renderer)) { renderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); - isDrawing = true; } for(EnumFacing side : EnumFacing.values()) diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index 54dd05586..3faa0bb4a 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -38,7 +38,6 @@ public class RenderUniversalCable extends RenderTransmitterBase Date: Sat, 23 Jul 2016 23:11:32 -0400 Subject: [PATCH 02/16] Restrict Thermal Evaporation Plant output to needed --- .../common/tile/TileEntityThermalEvaporationController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 668756e92..dafd4afc9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -115,10 +115,12 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { int outputNeeded = outputTank.getCapacity()-outputTank.getFluidAmount(); int inputStored = inputTank.getFluidAmount(); + double outputRatio = (double)recipe.recipeOutput.output.amount/(double)recipe.recipeInput.ingredient.amount; double tempMult = Math.max(0, getTemperature())*general.evaporationTempMultiplier; double inputToUse = (tempMult*recipe.recipeInput.ingredient.amount)*((float)height/(float)MAX_HEIGHT); inputToUse = Math.min(inputTank.getFluidAmount(), inputToUse); + inputToUse = Math.min(inputToUse, outputNeeded/outputRatio); lastGain = (float)inputToUse/(float)recipe.recipeInput.ingredient.amount; partialInput += inputToUse; From 27f0d9ce1168fcaffd4eed80f55b7fe13868d192 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Jul 2016 23:35:59 -0400 Subject: [PATCH 03/16] Add proper crash check --- .../mekanism/common/util/MekanismUtils.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index eb3970bb7..21bebf2aa 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1501,15 +1501,17 @@ public final class MekanismUtils return true; } - if(isBCWrench(tool.getItem()) && ((IToolWrench)tool.getItem()).canWrench(player, pos)) - { - return true; - } - - if(isCoFHHammer(tool.getItem()) && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos)) - { - return true; - } + try { + if(isBCWrench(tool.getItem()) && ((IToolWrench)tool.getItem()).canWrench(player, pos)) + { + return true; + } + + if(isCoFHHammer(tool.getItem()) && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos)) + { + return true; + } + } catch(Throwable t) {} return false; } From 1355bd11cdc48532d603092470b23aa3943c96ad Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 25 Jul 2016 18:55:54 -0400 Subject: [PATCH 04/16] Added a NONE TransformType check --- src/main/java/mekanism/client/render/ctm/CTMModelFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index 6e9df8564..ba35df7f8 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -158,6 +158,7 @@ public class CTMModelFactory implements IPerspectiveAwareModel .put(TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.25f)) .put(TransformType.HEAD, get(0, 0, 0, 0, 0, 0, 1)) .put(TransformType.FIXED, get(0, 0, 0, 0, 0, 0, 1)) + .put(TransformType.NONE, get(0, 0, 0, 0, 0, 0, 0)) .build(); @Override From 38999f3647f853d3a56e9f406346a4268ad99545 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 Jul 2016 12:36:15 -0400 Subject: [PATCH 05/16] Better Creative Energy Cube config --- src/main/java/mekanism/common/item/ItemBlockEnergyCube.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 62f796a5c..8106568ed 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -11,6 +11,7 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; @@ -118,6 +119,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS tileEntity.tier = EnergyCubeTier.values()[getBaseTier(stack).ordinal()]; tileEntity.electricityStored = getEnergy(stack); + if(tileEntity.tier == EnergyCubeTier.CREATIVE) + { + tileEntity.configComponent.fillConfig(TransmissionType.ENERGY, tileEntity.getEnergy() > 0 ? 2 : 1); + } + if(tileEntity instanceof ISecurityTile) { ISecurityTile security = (ISecurityTile)tileEntity; From ff33572ff0ba2b7ba447d85f8dbe0028645b26cb Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:19:52 -0500 Subject: [PATCH 06/16] Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash --- build.properties | 2 +- src/main/java/mekanism/client/gui/GuiMItemStackFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiMMaterialFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTItemStackFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTMaterialFilter.java | 2 +- src/main/java/mekanism/common/content/miner/MinerFilter.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index aaa615497..ca167bcdb 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.10.2 mappings_version=snapshot_20160627 forge_version=12.18.1.2014 -mcmp_version=1.2.0_72 +mcmp_version=1.2.0_74 jei_version=3.7.6.231 mod_version=9.1.0 diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 6937b402e..81ae3c518 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -124,7 +124,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(filter.itemType != null) { - fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.itemType != null) diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 12fa8ee13..10c155e57 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -125,7 +125,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.materialItem != null) diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 29a7540c3..c53ea7733 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -181,7 +181,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(filter.itemType != null) { - fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 89); } if(filter.itemType != null) diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index f62beedd1..c6c8323f4 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -129,7 +129,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.materialItem != null) diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 433eda34a..f7f93eb8b 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -60,7 +60,7 @@ public abstract class MinerFilter if(dataStream.readBoolean()) { - replaceStack = new ItemStack(Block.getBlockById(dataStream.readInt()), 1, dataStream.readInt()); + replaceStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt()); } else { replaceStack = null; From 4a07cf961e7ab625b315bfe38b295547e03d9c4d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:26:51 -0500 Subject: [PATCH 07/16] Fixed CME when checking recipes --- src/main/java/mekanism/common/util/MekanismUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 21bebf2aa..0b6c5ef97 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1366,7 +1366,9 @@ public final class MekanismUtils return new ItemStack(dmgItems[0].getItem(), 1, solve); } - for(IRecipe recipe : (List)CraftingManager.getInstance().getRecipeList()) + List list = (List)((ArrayList)CraftingManager.getInstance().getRecipeList()).clone(); + + for(IRecipe recipe : list) { if(recipe.matches(inv, world)) { From cf9c9d0d503e36c0c6b7f0a0ec25d7123e4fb148 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:36:43 -0500 Subject: [PATCH 08/16] Fixed Atomic Disassembler attack speed --- .../common/item/ItemAtomicDisassembler.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 6f26358eb..b8ef209a8 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.google.common.collect.Multimap; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; @@ -17,9 +19,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.DamageSource; @@ -315,6 +320,19 @@ public class ItemAtomicDisassembler extends ItemEnergized { return false; } + + @Override + public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) + { + Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + + if(equipmentSlot == EntityEquipmentSlot.MAINHAND) + { + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0)); + } + + return multimap; + } public static class Finder { From 6c8e9323400f904aad080aa581b5b442e575e47b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:39:39 -0500 Subject: [PATCH 09/16] Fixed EnergyAcceptorWrapper crash --- src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 1b31f265e..777c8fade 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -20,7 +20,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor public static EnergyAcceptorWrapper get(TileEntity tileEntity, EnumFacing side) { - if(tileEntity != null && tileEntity.getWorld() == null) + if(tileEntity == null || tileEntity.getWorld() == null) { return null; } From fa871c55f01580d194ccffbf4b13a7908109c6e6 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:48:42 -0500 Subject: [PATCH 10/16] Fixed some rendering issues --- .../render/tileentity/RenderDigitalMiner.java | 2 +- .../tileentity/RenderResistiveHeater.java | 2 +- .../mekanism/blockstates/digital_miner.json | 2 +- .../blockstates/resistive_heater.json | 2 +- .../mekanism/models/block/digital_miner.json | 736 ------------------ .../models/block/resistive_heater.json | 268 ------- 6 files changed, 4 insertions(+), 1008 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/models/block/digital_miner.json delete mode 100644 src/main/resources/assets/mekanism/models/block/resistive_heater.json diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index bf19763e6..8e7025306 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -46,7 +46,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer Date: Thu, 4 Aug 2016 15:19:36 -0400 Subject: [PATCH 11/16] Update Tesla API, render fixes --- src/api/java/net/darkhax/tesla/Tesla.java | 2 +- .../darkhax/tesla/api/BaseTeslaContainer.java | 225 ------------------ .../net/darkhax/tesla/api/ITeslaConsumer.java | 2 +- .../net/darkhax/tesla/api/ITeslaHolder.java | 0 .../net/darkhax/tesla/api/ITeslaProducer.java | 2 +- .../tesla/api/InfiniteTeslaConsumer.java | 16 -- .../tesla/api/InfiniteTeslaProducer.java | 16 -- .../implementation/BaseTeslaContainer.java | 8 +- .../BaseTeslaContainerProvider.java | 0 .../implementation/InfiniteTeslaConsumer.java | 0 .../InfiniteTeslaConsumerProvider.java | 0 .../implementation/InfiniteTeslaProducer.java | 0 .../InfiniteTeslaProducerProvider.java | 0 .../tesla/capability/TeslaCapabilities.java | 9 + .../java/net/darkhax/tesla/lib/Constants.java | 4 +- .../java/net/darkhax/tesla/lib/PowerBar.java | 103 ++++++++ .../net/darkhax/tesla/lib/TeslaUtils.java | 136 +++++++++++ .../client/render/MekanismRenderer.java | 25 ++ .../render/item/BakedCustomItemModel.java | 14 +- .../render/item/BakedGeneratorItemModel.java | 13 +- 20 files changed, 287 insertions(+), 288 deletions(-) mode change 100644 => 100755 src/api/java/net/darkhax/tesla/Tesla.java delete mode 100644 src/api/java/net/darkhax/tesla/api/BaseTeslaContainer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/ITeslaConsumer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/ITeslaHolder.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/ITeslaProducer.java delete mode 100644 src/api/java/net/darkhax/tesla/api/InfiniteTeslaConsumer.java delete mode 100644 src/api/java/net/darkhax/tesla/api/InfiniteTeslaProducer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainerProvider.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumerProvider.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducer.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducerProvider.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/capability/TeslaCapabilities.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/lib/Constants.java create mode 100755 src/api/java/net/darkhax/tesla/lib/PowerBar.java mode change 100644 => 100755 src/api/java/net/darkhax/tesla/lib/TeslaUtils.java diff --git a/src/api/java/net/darkhax/tesla/Tesla.java b/src/api/java/net/darkhax/tesla/Tesla.java old mode 100644 new mode 100755 index 5f32c9919..540c2ca8d --- a/src/api/java/net/darkhax/tesla/Tesla.java +++ b/src/api/java/net/darkhax/tesla/Tesla.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = Constants.MOD_ID, name = Constants.MOD_NAME, version = Constants.VERSION_NUMBER) +@Mod(modid = Constants.MOD_ID, name = Constants.MOD_NAME, version = Constants.VERSION_NUMBER, acceptedMinecraftVersions = "[1.9.4,1.10.2]") public class Tesla { @Mod.Instance(Constants.MOD_ID) diff --git a/src/api/java/net/darkhax/tesla/api/BaseTeslaContainer.java b/src/api/java/net/darkhax/tesla/api/BaseTeslaContainer.java deleted file mode 100644 index ee5203966..000000000 --- a/src/api/java/net/darkhax/tesla/api/BaseTeslaContainer.java +++ /dev/null @@ -1,225 +0,0 @@ -package net.darkhax.tesla.api; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.INBTSerializable; - -/** - * A basic Tesla container that serves as a consumer, producer and holder. Custom - * implementations do not need to use all three. The INBTSerializable interface is also - * optional. - * - * @deprecated Moved to net.darkhax.tesla.api.implementation - */ -@Deprecated -public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITeslaHolder, INBTSerializable { - - /** - * The amount of stored Tesla power. - */ - private long stored; - - /** - * The maximum amount of Tesla power that can be stored. - */ - private long capacity; - - /** - * The maximum amount of Tesla power that can be accepted. - */ - private long inputRate; - - /** - * The maximum amount of Tesla power that can be extracted - */ - private long outputRate; - - /** - * Default constructor. Sets capacity to 5000 and transfer rate to 50. This constructor - * will not set the amount of stored power. These values are arbitrary and should not be - * taken as a base line for balancing. - */ - public BaseTeslaContainer() { - - this(5000, 50, 50); - } - - /** - * Constructor for setting the basic values. Will not construct with any stored power. - * - * @param capacity The maximum amount of Tesla power that the container should hold. - * @param input The maximum rate of power that can be accepted at a time. - * @param output The maximum rate of power that can be extracted at a time. - */ - public BaseTeslaContainer(long capacity, long input, long output) { - - this(0, capacity, input, output); - } - - /** - * Constructor for setting all of the base values, including the stored power. - * - * @param power The amount of stored power to initialize the container with. - * @param capacity The maximum amount of Tesla power that the container should hold. - * @param input The maximum rate of power that can be accepted at a time. - * @param output The maximum rate of power that can be extracted at a time. - */ - public BaseTeslaContainer(long power, long capacity, long input, long output) { - - this.stored = power; - this.capacity = capacity; - this.inputRate = input; - this.outputRate = output; - } - - /** - * Constructor for creating an instance directly from a compound tag. This expects that the - * compound tag has some of the required data. @See {@link #deserializeNBT(NBTTagCompound)} - * for precise info on what is expected. This constructor will only set the stored power if - * it has been written on the compound tag. - * - * @param dataTag The NBTCompoundTag to read the important data from. - */ - public BaseTeslaContainer(NBTTagCompound dataTag) { - - this.deserializeNBT(dataTag); - } - - @Override - public long getStoredPower () { - - return this.stored; - } - - @Override - public long givePower (long Tesla, boolean simulated) { - - final long acceptedTesla = Math.min(this.capacity - this.stored, Math.min(this.inputRate, Tesla)); - - if (!simulated) - this.stored += acceptedTesla; - - return acceptedTesla; - } - - @Override - public long takePower (long Tesla, boolean simulated) { - - final long removedPower = Math.min(this.stored, Math.min(this.outputRate, Tesla)); - - if (!simulated) - this.stored -= removedPower; - - return removedPower; - } - - @Override - public long getCapacity () { - - return this.capacity; - } - - @Override - public NBTTagCompound serializeNBT () { - - final NBTTagCompound dataTag = new NBTTagCompound(); - dataTag.setLong("TeslaPower", this.stored); - dataTag.setLong("TeslaCapacity", this.capacity); - dataTag.setLong("TeslaInput", this.inputRate); - dataTag.setLong("TeslaOutput", this.outputRate); - - return dataTag; - } - - @Override - public void deserializeNBT (NBTTagCompound nbt) { - - this.stored = nbt.getLong("TeslaPower"); - - if (nbt.hasKey("TeslaCapacity")) - this.capacity = nbt.getLong("TeslaCapacity"); - - if (nbt.hasKey("TeslaInput")) - this.inputRate = nbt.getLong("TeslaInput"); - - if (nbt.hasKey("TeslaOutput")) - this.outputRate = nbt.getLong("TeslaOutput"); - - if (this.stored > this.capacity) - this.stored = this.capacity; - } - - /** - * Sets the capacity of the the container. If the existing stored power is more than the - * new capacity, the stored power will be decreased to match the new capacity. - * - * @param capacity The new capacity for the container. - * @return The instance of the container being updated. - */ - public BaseTeslaContainer setCapacity (long capacity) { - - this.capacity = capacity; - - if (this.stored > capacity) - this.stored = capacity; - - return this; - } - - /** - * Gets the maximum amount of Tesla power that can be accepted by the container. - * - * @return The amount of Tesla power that can be accepted at any time. - */ - public long getInputRate () { - - return this.inputRate; - } - - /** - * Sets the maximum amount of Tesla power that can be accepted by the container. - * - * @param rate The amount of Tesla power to accept at a time. - * @return The instance of the container being updated. - */ - public BaseTeslaContainer setInputRate (long rate) { - - this.inputRate = rate; - return this; - } - - /** - * Gets the maximum amount of Tesla power that can be pulled from the container. - * - * @return The amount of Tesla power that can be extracted at any time. - */ - public long getOutputRate () { - - return this.outputRate; - } - - /** - * Sets the maximum amount of Tesla power that can be pulled from the container. - * - * @param rate The amount of Tesla power that can be extracted. - * @return The instance of the container being updated. - */ - public BaseTeslaContainer setOutputRate (long rate) { - - this.outputRate = rate; - return this; - } - - /** - * Sets both the input and output rates of the container at the same time. Both rates will - * be the same. - * - * @param rate The input/output rate for the Tesla container. - * @return The instance of the container being updated. - */ - public BaseTeslaContainer setTransferRate (long rate) { - - this.setInputRate(rate); - this.setOutputRate(rate); - return this; - } -} \ No newline at end of file diff --git a/src/api/java/net/darkhax/tesla/api/ITeslaConsumer.java b/src/api/java/net/darkhax/tesla/api/ITeslaConsumer.java old mode 100644 new mode 100755 index 049840c8e..1f44d716f --- a/src/api/java/net/darkhax/tesla/api/ITeslaConsumer.java +++ b/src/api/java/net/darkhax/tesla/api/ITeslaConsumer.java @@ -7,7 +7,7 @@ public interface ITeslaConsumer { * * @param power The amount of power to offer. * @param simulated Whether or not this is being called as part of a simulation. - * Simulations are used to get information without affecting the Tesla Producer. + * Simulations are used to get information without affecting the Tesla Producer. * @return The amount of power that the consumer accepts. */ long givePower (long power, boolean simulated); diff --git a/src/api/java/net/darkhax/tesla/api/ITeslaHolder.java b/src/api/java/net/darkhax/tesla/api/ITeslaHolder.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/api/ITeslaProducer.java b/src/api/java/net/darkhax/tesla/api/ITeslaProducer.java old mode 100644 new mode 100755 index ec3e17b10..71f1b570b --- a/src/api/java/net/darkhax/tesla/api/ITeslaProducer.java +++ b/src/api/java/net/darkhax/tesla/api/ITeslaProducer.java @@ -7,7 +7,7 @@ public interface ITeslaProducer { * * @param power The amount of power to request. * @param simulated Whether or not this is being called as part of a simulation. - * Simulations are used to get information without affecting the Tesla Producer. + * Simulations are used to get information without affecting the Tesla Producer. * @return The amount of power that the Tesla Producer will give. */ long takePower (long power, boolean simulated); diff --git a/src/api/java/net/darkhax/tesla/api/InfiniteTeslaConsumer.java b/src/api/java/net/darkhax/tesla/api/InfiniteTeslaConsumer.java deleted file mode 100644 index 7f1d670eb..000000000 --- a/src/api/java/net/darkhax/tesla/api/InfiniteTeslaConsumer.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.darkhax.tesla.api; - -/** - * Logic for a Tesla Consumer that will consume infinite amounts of power. - * - * @deprecated Moved to net.darkhax.tesla.api.implementation - */ -@Deprecated -public class InfiniteTeslaConsumer implements ITeslaConsumer { - - @Override - public long givePower (long power, boolean simulated) { - - return power; - } -} \ No newline at end of file diff --git a/src/api/java/net/darkhax/tesla/api/InfiniteTeslaProducer.java b/src/api/java/net/darkhax/tesla/api/InfiniteTeslaProducer.java deleted file mode 100644 index 31987b886..000000000 --- a/src/api/java/net/darkhax/tesla/api/InfiniteTeslaProducer.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.darkhax.tesla.api; - -/** - * Logic for a Tesla Producer that will produce an infinite amount of energy. - * - * @deprecated Moved to net.darkhax.tesla.api.implementation - */ -@Deprecated -public class InfiniteTeslaProducer implements ITeslaProducer { - - @Override - public long takePower (long power, boolean simulated) { - - return power; - } -} \ No newline at end of file diff --git a/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainer.java b/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainer.java old mode 100644 new mode 100755 index 9b68444cf..6d25952f8 --- a/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainer.java +++ b/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainer.java @@ -93,7 +93,7 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl @Override public long givePower (long Tesla, boolean simulated) { - final long acceptedTesla = Math.min(this.capacity - this.stored, Math.min(this.inputRate, Tesla)); + final long acceptedTesla = Math.min(this.getCapacity() - this.stored, Math.min(this.getInputRate(), Tesla)); if (!simulated) this.stored += acceptedTesla; @@ -104,7 +104,7 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl @Override public long takePower (long Tesla, boolean simulated) { - final long removedPower = Math.min(this.stored, Math.min(this.outputRate, Tesla)); + final long removedPower = Math.min(this.stored, Math.min(this.getOutputRate(), Tesla)); if (!simulated) this.stored -= removedPower; @@ -144,8 +144,8 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl if (nbt.hasKey("TeslaOutput")) this.outputRate = nbt.getLong("TeslaOutput"); - if (this.stored > this.capacity) - this.stored = this.capacity; + if (this.stored > this.getCapacity()) + this.stored = this.getCapacity(); } /** diff --git a/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainerProvider.java b/src/api/java/net/darkhax/tesla/api/implementation/BaseTeslaContainerProvider.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumer.java b/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumer.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumerProvider.java b/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaConsumerProvider.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducer.java b/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducer.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducerProvider.java b/src/api/java/net/darkhax/tesla/api/implementation/InfiniteTeslaProducerProvider.java old mode 100644 new mode 100755 diff --git a/src/api/java/net/darkhax/tesla/capability/TeslaCapabilities.java b/src/api/java/net/darkhax/tesla/capability/TeslaCapabilities.java old mode 100644 new mode 100755 index 47c4b17d6..eead19a05 --- a/src/api/java/net/darkhax/tesla/capability/TeslaCapabilities.java +++ b/src/api/java/net/darkhax/tesla/capability/TeslaCapabilities.java @@ -11,12 +11,21 @@ import net.minecraftforge.common.capabilities.CapabilityInject; public class TeslaCapabilities { + /** + * Access to the consumer capability. Can be used for making checks. + */ @CapabilityInject(ITeslaConsumer.class) public static Capability CAPABILITY_CONSUMER = null; + /** + * Access to the producer capability. Can be used for making checks. + */ @CapabilityInject(ITeslaProducer.class) public static Capability CAPABILITY_PRODUCER = null; + /** + * Access to the holder capability. Can be used for making checks. + */ @CapabilityInject(ITeslaHolder.class) public static Capability CAPABILITY_HOLDER = null; diff --git a/src/api/java/net/darkhax/tesla/lib/Constants.java b/src/api/java/net/darkhax/tesla/lib/Constants.java old mode 100644 new mode 100755 index 513e53583..1264984bf --- a/src/api/java/net/darkhax/tesla/lib/Constants.java +++ b/src/api/java/net/darkhax/tesla/lib/Constants.java @@ -2,7 +2,7 @@ package net.darkhax.tesla.lib; public class Constants { - public static final String MOD_ID = "Tesla"; + public static final String MOD_ID = "tesla"; public static final String MOD_NAME = "TESLA"; - public static final String VERSION_NUMBER = "1.1.0.0"; + public static final String VERSION_NUMBER = "1.2.1.0"; } diff --git a/src/api/java/net/darkhax/tesla/lib/PowerBar.java b/src/api/java/net/darkhax/tesla/lib/PowerBar.java new file mode 100755 index 000000000..1ac5f4737 --- /dev/null +++ b/src/api/java/net/darkhax/tesla/lib/PowerBar.java @@ -0,0 +1,103 @@ +package net.darkhax.tesla.lib; + +import net.darkhax.tesla.api.ITeslaHolder; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class PowerBar { + + /** + * Constant reference to the included gui element sheet. + */ + private static final ResourceLocation TEXTURE_SHEET = new ResourceLocation("tesla", "textures/gui/elements.png"); + + /** + * The x position of the power bar on the screen. + */ + private final int x; + + /** + * The y position of the power bar on the screen. + */ + private final int y; + + /** + * The screen to draw the power bar on. + */ + private final GuiScreen screen; + + /** + * The type of background the use when drawing the power bar. + */ + private final BackgroundType background; + + /** + * Object that can be used to draw a power bar on the screen. + * + * @param screen The screen to draw the power bar on. + * @param x The x position of the power bar on the screen. + * @param y The y position of the power bar on the screen. + * @param type The background type to use for the power bar. + */ + public PowerBar(GuiScreen screen, int x, int y, BackgroundType type) { + + this.background = type; + this.screen = screen; + this.x = x; + this.y = y; + } + + /** + * Draws a power bar that represents the power held within an ITeslaHolder. + * + * @param holder The holder to represent. + */ + public void draw (ITeslaHolder holder) { + + draw(holder.getStoredPower(), holder.getCapacity()); + } + + /** + * Draws a power bard that represents the based power information. + * + * @param power The amount of power to represent. + * @param capacity The capacity to represent. + */ + public void draw (long power, long capacity) { + + screen.mc.getTextureManager().bindTexture(TEXTURE_SHEET); + + if (this.background == BackgroundType.LIGHT) + screen.drawTexturedModalRect(x, y, 3, 1, 14, 50); + + else if (this.background == BackgroundType.DARK) + screen.drawTexturedModalRect(x, y, 3, 53, 14, 50); + + long powerOffset = (power * 51) / capacity; + screen.drawTexturedModalRect(x + 1, (int) (y + 50 - powerOffset), 18, (int) (51 - powerOffset), 14, (int) (powerOffset + 2)); + } + + /** + * Describes a background image to be rendered for a power bar. + */ + public enum BackgroundType { + + /** + * No background texture. + */ + NONE, + + /** + * The lighter background texture. + */ + LIGHT, + + /** + * The darker background texture. + */ + DARK, + } +} \ No newline at end of file diff --git a/src/api/java/net/darkhax/tesla/lib/TeslaUtils.java b/src/api/java/net/darkhax/tesla/lib/TeslaUtils.java old mode 100644 new mode 100755 index 5588f1765..2d9f9012d --- a/src/api/java/net/darkhax/tesla/lib/TeslaUtils.java +++ b/src/api/java/net/darkhax/tesla/lib/TeslaUtils.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; import net.darkhax.tesla.capability.TeslaCapabilities; import net.minecraft.client.resources.I18n; @@ -12,6 +13,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; public class TeslaUtils { @@ -102,6 +104,140 @@ public class TeslaUtils { return I18n.format("unit.tesla." + getUnitType(tesla)); } + /** + * Checks if a capability provider has support for Tesla. + * + * @param provider The provider to check. ItemStack/TileEntity/Entity and so on. + * @param side The side to check. + * @return Whether or not the provider has support for Tesla. + */ + public static boolean hasTeslaSupport (ICapabilityProvider provider, EnumFacing side) { + + return isTeslaHolder(provider, side) || isTeslaConsumer(provider, side) || isTeslaProducer(provider, side); + } + + /** + * Checks if a capability provider is a Tesla holder. + * + * @param provider The provider to check. ItemStack/TileEntity/Entity and so on. + * @param side The side to check. + * @return Whether or not the provider is a Tesla holder. + */ + public static boolean isTeslaHolder (ICapabilityProvider provider, EnumFacing side) { + + return provider.hasCapability(TeslaCapabilities.CAPABILITY_HOLDER, side); + } + + /** + * Checks if a capability provider is a Tesla consumer. + * + * @param provider The provider to check. ItemStack/TileEntity/Entity and so on. + * @param side The side to check. + * @return Whether or not the provider is a Tesla consumer. + */ + public static boolean isTeslaConsumer (ICapabilityProvider provider, EnumFacing side) { + + return provider.hasCapability(TeslaCapabilities.CAPABILITY_CONSUMER, side); + } + + /** + * Checks if a capability provider is a Tesla producer. + * + * @param provider The provider to check. ItemStack/TileEntity/Entity and so on. + * @param side The side to check. + * @return Whether or not the provider is a Tesla producer. + */ + public static boolean isTeslaProducer (ICapabilityProvider provider, EnumFacing side) { + + return provider.hasCapability(TeslaCapabilities.CAPABILITY_PRODUCER, side); + } + + /** + * Gets an ITeslaHolder implementation from the capability provider. + * + * @param provider The provider to get the capability from. + * @param side The side to access; + * @return A Tesla holder implementation, or null if none could be found. + */ + public static ITeslaHolder getTeslaHolder (ICapabilityProvider provider, EnumFacing side) { + + return (ITeslaHolder) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side); + } + + /** + * Gets an ITeslaConsumer implementation from the capability provider. + * + * @param provider The provider to get the capability from. + * @param side The side to access; + * @return A Tesla consumer implementation, or null if none could be found. + */ + public static ITeslaConsumer getTeslaConsumer (ICapabilityProvider provider, EnumFacing side) { + + return (ITeslaConsumer) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side); + } + + /** + * Gets an ITeslaProducer implementation from the capability provider. + * + * @param provider The provider to get the capability from. + * @param side The side to access; + * @return A Tesla producer implementation, or null if none could be found. + */ + public static ITeslaProducer getTeslaProducer (ICapabilityProvider provider, EnumFacing side) { + + return (ITeslaProducer) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side); + } + + /** + * Gets the capacity of a provider. + * + * @param provider The provider to access. + * @param side The side to access. + * @return The capacity of the provider. 0 if it has no capacity. + */ + public static long getCapacity (ICapabilityProvider provider, EnumFacing side) { + + return isTeslaHolder(provider, side) ? getTeslaHolder(provider, side).getCapacity() : 0; + } + + /** + * Gets the stored power of a provider. + * + * @param provider The provider to access. + * @param side The side to access. + * @return The amount of power stored. + */ + public static long getStoredPower (ICapabilityProvider provider, EnumFacing side) { + + return isTeslaHolder(provider, side) ? getTeslaHolder(provider, side).getStoredPower() : 0; + } + + /** + * Attempt to give power to a provider. + * + * @param power The amount of power to offer. + * @param simulated Whether or not this is being called as part of a simulation. + * Simulations are used to get information without affecting the Tesla Producer. + * @return The amount of power that the consumer accepts. + */ + public static long givePower (ICapabilityProvider provider, EnumFacing side, long power, boolean simulated) { + + return isTeslaConsumer(provider, side) ? getTeslaConsumer(provider, side).givePower(power, simulated) : 0; + } + + /** + * Attempts to take power from a provider. + * + * @param power The amount of power to request. + * @param simulated Whether or not this is being called as part of a simulation. + * Simulations are used to get information without affecting the Tesla Producer. + * @return The amount of power that the Tesla Producer will give. + */ + public static long takePower (ICapabilityProvider provider, EnumFacing side, long power, boolean simulated) { + + return isTeslaProducer(provider, side) ? getTeslaProducer(provider, side).takePower(power, simulated) : 0; + } + /** * Gets a list of all capabilities that touch a BlockPos. This will search for tile * entities touching the BlockPos and then query them for access to their capabilities. diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 895b09439..9443e47ec 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -34,6 +34,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -225,6 +226,30 @@ public class MekanismRenderer return map.containsKey(fluid) ? map.get(fluid) : missingIcon; } + private static VertexFormat prevFormat = null; + private static int prevMode = -1; + + public static void pauseRenderer(Tessellator tess) + { + if(MekanismRenderer.isDrawing(tess)) + { + prevFormat = tess.getBuffer().getVertexFormat(); + prevMode = tess.getBuffer().getDrawMode(); + tess.draw(); + } + } + + public static void resumeRenderer(Tessellator tess) + { + if(prevFormat != null) + { + tess.getBuffer().begin(prevMode, prevFormat); + } + + prevFormat = null; + prevMode = -1; + } + public static boolean isDrawing(Tessellator tess) { return isDrawing(tess.getBuffer()); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index b999af21d..88dd0ba1f 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -62,7 +62,6 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -426,12 +425,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel Tessellator tessellator = Tessellator.getInstance(); VertexFormat prevFormat = null; + int prevMode = -1; - if(MekanismRenderer.isDrawing(tessellator)) - { - prevFormat = tessellator.getBuffer().getVertexFormat(); - tessellator.draw(); - } + MekanismRenderer.pauseRenderer(tessellator); List generalQuads = new LinkedList(); @@ -448,11 +444,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.popMatrix(); - if(prevFormat != null) - { - VertexBuffer worldrenderer = tessellator.getBuffer(); - worldrenderer.begin(7, prevFormat); - } + MekanismRenderer.resumeRenderer(tessellator); if(Block.getBlockFromItem(stack.getItem()) != null) { diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index f5edc8105..3dcf2fc0f 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -21,7 +21,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -130,11 +129,7 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo Tessellator tessellator = Tessellator.getInstance(); VertexFormat prevFormat = null; - if(MekanismRenderer.isDrawing(tessellator)) - { - prevFormat = tessellator.getBuffer().getVertexFormat(); - tessellator.draw(); - } + MekanismRenderer.pauseRenderer(tessellator); List generalQuads = new LinkedList(); @@ -150,11 +145,7 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.popMatrix(); - if(prevFormat != null) - { - VertexBuffer worldrenderer = tessellator.getBuffer(); - worldrenderer.begin(7, prevFormat); - } + MekanismRenderer.resumeRenderer(tessellator); if(Block.getBlockFromItem(stack.getItem()) != null) { From a4a335a8b938b51c242937c42fbc1fe1114f6a0a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 4 Aug 2016 15:21:49 -0400 Subject: [PATCH 12/16] Fixed Tesla mod ID --- .../common/integration/TeslaIntegration.java | 14 +++++++------- .../common/integration/TeslaItemWrapper.java | 14 +++++++------- .../common/multipart/PartUniversalCable.java | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/integration/TeslaIntegration.java b/src/main/java/mekanism/common/integration/TeslaIntegration.java index fe6afb1d5..b489b2cad 100644 --- a/src/main/java/mekanism/common/integration/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/TeslaIntegration.java @@ -12,9 +12,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"), - @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"), - @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla") + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla") }) public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaProducer { @@ -29,28 +29,28 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long getStoredPower() { return (long)Math.round(tileEntity.getEnergy()*general.TO_TESLA); } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long getCapacity() { return (long)Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA); } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long takePower(long power, boolean simulated) { return (long)Math.round(tileEntity.removeEnergyFromProvider(side, power*general.FROM_TESLA)*general.TO_TESLA); } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long givePower(long power, boolean simulated) { return (long)Math.round(tileEntity.transferEnergyToAcceptor(side, power*general.FROM_TESLA)*general.TO_TESLA); diff --git a/src/main/java/mekanism/common/integration/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/TeslaItemWrapper.java index 0664a337d..33fa8232f 100644 --- a/src/main/java/mekanism/common/integration/TeslaItemWrapper.java +++ b/src/main/java/mekanism/common/integration/TeslaItemWrapper.java @@ -13,9 +13,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"), - @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"), - @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla") + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla") }) public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, ITeslaConsumer, ITeslaProducer { @@ -33,7 +33,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long takePower(long power, boolean simulated) { if(getItem().canSend(getStack())) @@ -53,7 +53,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long givePower(long power, boolean simulated) { if(getItem().canReceive(getStack())) @@ -73,14 +73,14 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long getStoredPower() { return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); } @Override - @Method(modid = "Tesla") + @Method(modid = "tesla") public long getCapacity() { return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 1001945d4..2a52bdb26 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -36,7 +36,7 @@ import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; @InterfaceList({ - @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla") + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla") }) public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer { From 19453b56f33e77681f31d4e30e8e9a68dc73bb3b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 4 Aug 2016 15:35:46 -0400 Subject: [PATCH 13/16] Fix rendering of handheld items --- .../resources/assets/mekanism/models/item/Configurator.json | 2 +- .../resources/assets/mekanismtools/models/item/BronzeAxe.json | 2 +- .../resources/assets/mekanismtools/models/item/BronzeHoe.json | 2 +- .../resources/assets/mekanismtools/models/item/BronzePaxel.json | 2 +- .../assets/mekanismtools/models/item/BronzePickaxe.json | 2 +- .../assets/mekanismtools/models/item/BronzeShovel.json | 2 +- .../resources/assets/mekanismtools/models/item/BronzeSword.json | 2 +- .../assets/mekanismtools/models/item/DiamondPaxel.json | 2 +- .../assets/mekanismtools/models/item/GlowstoneAxe.json | 2 +- .../assets/mekanismtools/models/item/GlowstoneHoe.json | 2 +- .../assets/mekanismtools/models/item/GlowstonePaxel.json | 2 +- .../assets/mekanismtools/models/item/GlowstonePickaxe.json | 2 +- .../assets/mekanismtools/models/item/GlowstoneShovel.json | 2 +- .../assets/mekanismtools/models/item/GlowstoneSword.json | 2 +- .../resources/assets/mekanismtools/models/item/GoldPaxel.json | 2 +- .../resources/assets/mekanismtools/models/item/IronPaxel.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliAxe.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliHoe.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliPaxel.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliPickaxe.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliShovel.json | 2 +- .../assets/mekanismtools/models/item/LapisLazuliSword.json | 2 +- .../resources/assets/mekanismtools/models/item/ObsidianAxe.json | 2 +- .../resources/assets/mekanismtools/models/item/ObsidianHoe.json | 2 +- .../assets/mekanismtools/models/item/ObsidianPaxel.json | 2 +- .../assets/mekanismtools/models/item/ObsidianPickaxe.json | 2 +- .../assets/mekanismtools/models/item/ObsidianShovel.json | 2 +- .../assets/mekanismtools/models/item/ObsidianSword.json | 2 +- .../resources/assets/mekanismtools/models/item/OsmiumAxe.json | 2 +- .../resources/assets/mekanismtools/models/item/OsmiumHoe.json | 2 +- .../resources/assets/mekanismtools/models/item/OsmiumPaxel.json | 2 +- .../assets/mekanismtools/models/item/OsmiumPickaxe.json | 2 +- .../assets/mekanismtools/models/item/OsmiumShovel.json | 2 +- .../resources/assets/mekanismtools/models/item/OsmiumSword.json | 2 +- .../resources/assets/mekanismtools/models/item/SteelAxe.json | 2 +- .../resources/assets/mekanismtools/models/item/SteelHoe.json | 2 +- .../resources/assets/mekanismtools/models/item/SteelPaxel.json | 2 +- .../assets/mekanismtools/models/item/SteelPickaxe.json | 2 +- .../resources/assets/mekanismtools/models/item/SteelShovel.json | 2 +- .../resources/assets/mekanismtools/models/item/SteelSword.json | 2 +- .../resources/assets/mekanismtools/models/item/StonePaxel.json | 2 +- .../resources/assets/mekanismtools/models/item/WoodPaxel.json | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main/resources/assets/mekanism/models/item/Configurator.json b/src/main/resources/assets/mekanism/models/item/Configurator.json index 7e3c1b7fa..63ddb2093 100644 --- a/src/main/resources/assets/mekanism/models/item/Configurator.json +++ b/src/main/resources/assets/mekanism/models/item/Configurator.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanism:items/Configurator" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzeAxe.json b/src/main/resources/assets/mekanismtools/models/item/BronzeAxe.json index 997a7383a..af209a8b8 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzeAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzeAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzeAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzeHoe.json b/src/main/resources/assets/mekanismtools/models/item/BronzeHoe.json index f3b0e144c..9d2783bf4 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzeHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzeHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzeHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzePaxel.json b/src/main/resources/assets/mekanismtools/models/item/BronzePaxel.json index 1acdf2761..5546db75d 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzePaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzePaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzePaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzePickaxe.json b/src/main/resources/assets/mekanismtools/models/item/BronzePickaxe.json index 28a1b87a3..8826fe441 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzePickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzePickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzePickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzeShovel.json b/src/main/resources/assets/mekanismtools/models/item/BronzeShovel.json index 0d9334959..eed302a23 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzeShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzeShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzeShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/BronzeSword.json b/src/main/resources/assets/mekanismtools/models/item/BronzeSword.json index ddad08ff6..4cb478629 100644 --- a/src/main/resources/assets/mekanismtools/models/item/BronzeSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/BronzeSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/BronzeSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/DiamondPaxel.json b/src/main/resources/assets/mekanismtools/models/item/DiamondPaxel.json index 43eab3548..799887e0d 100644 --- a/src/main/resources/assets/mekanismtools/models/item/DiamondPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/DiamondPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/DiamondPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstoneAxe.json b/src/main/resources/assets/mekanismtools/models/item/GlowstoneAxe.json index 4fa02b9b6..8eb4866ca 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstoneAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstoneAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstoneAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstoneHoe.json b/src/main/resources/assets/mekanismtools/models/item/GlowstoneHoe.json index 4d6e98b1c..5777490bb 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstoneHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstoneHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstoneHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstonePaxel.json b/src/main/resources/assets/mekanismtools/models/item/GlowstonePaxel.json index 1fa87bd18..fe1c7ea8a 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstonePaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstonePaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstonePaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstonePickaxe.json b/src/main/resources/assets/mekanismtools/models/item/GlowstonePickaxe.json index c0eda2c44..27a8c6932 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstonePickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstonePickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstonePickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstoneShovel.json b/src/main/resources/assets/mekanismtools/models/item/GlowstoneShovel.json index 6b7118826..c2d91c22d 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstoneShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstoneShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstoneShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GlowstoneSword.json b/src/main/resources/assets/mekanismtools/models/item/GlowstoneSword.json index 1cc1321b6..4d3e83219 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GlowstoneSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/GlowstoneSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GlowstoneSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/GoldPaxel.json b/src/main/resources/assets/mekanismtools/models/item/GoldPaxel.json index cbffdd446..259de5f64 100644 --- a/src/main/resources/assets/mekanismtools/models/item/GoldPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/GoldPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/GoldPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/IronPaxel.json b/src/main/resources/assets/mekanismtools/models/item/IronPaxel.json index 8eef21d3a..ab7816d75 100644 --- a/src/main/resources/assets/mekanismtools/models/item/IronPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/IronPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/IronPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliAxe.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliAxe.json index f6525e5ee..e694ba87e 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliHoe.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliHoe.json index d228f28a7..b8eda2d8f 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPaxel.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPaxel.json index 14fb8bc2d..bab548e96 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPickaxe.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPickaxe.json index 6bc4bb2ef..077c302f1 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliPickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliPickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliShovel.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliShovel.json index ddd35328e..5e6ba41ee 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliSword.json b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliSword.json index 9d28c9658..0a356ba9f 100644 --- a/src/main/resources/assets/mekanismtools/models/item/LapisLazuliSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/LapisLazuliSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/LapisLazuliSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianAxe.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianAxe.json index ec2f4a3ca..b2124e356 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianHoe.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianHoe.json index aa351fdb1..ccb992924 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianPaxel.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianPaxel.json index a7f0a75f9..5c06a31eb 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianPickaxe.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianPickaxe.json index 48a9a25ff..083f7ccbb 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianPickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianPickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianPickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianShovel.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianShovel.json index 65c6a100d..3f529c424 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/ObsidianSword.json b/src/main/resources/assets/mekanismtools/models/item/ObsidianSword.json index 1bd57d2e2..72696e461 100644 --- a/src/main/resources/assets/mekanismtools/models/item/ObsidianSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/ObsidianSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/ObsidianSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumAxe.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumAxe.json index 39764f6d4..244e4060d 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumHoe.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumHoe.json index e76be04dc..4c3ac668b 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumPaxel.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumPaxel.json index c8363a6da..49d6e7690 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumPickaxe.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumPickaxe.json index 110d65b9b..4b7effd45 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumPickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumPickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumPickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumShovel.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumShovel.json index b6a593467..75b9a6723 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/OsmiumSword.json b/src/main/resources/assets/mekanismtools/models/item/OsmiumSword.json index 8e0e16c90..e05d18297 100644 --- a/src/main/resources/assets/mekanismtools/models/item/OsmiumSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/OsmiumSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/OsmiumSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelAxe.json b/src/main/resources/assets/mekanismtools/models/item/SteelAxe.json index c56ca16cc..1c8210ae4 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelAxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelAxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelAxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelHoe.json b/src/main/resources/assets/mekanismtools/models/item/SteelHoe.json index 50b4dc657..833938da2 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelHoe.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelHoe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelHoe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelPaxel.json b/src/main/resources/assets/mekanismtools/models/item/SteelPaxel.json index 98c83ef35..0037aa29a 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelPaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelPickaxe.json b/src/main/resources/assets/mekanismtools/models/item/SteelPickaxe.json index 77d0a7746..0a6e1cfee 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelPickaxe.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelPickaxe.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelPickaxe" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelShovel.json b/src/main/resources/assets/mekanismtools/models/item/SteelShovel.json index a5886092e..0e7563b3d 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelShovel.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelShovel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelShovel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/SteelSword.json b/src/main/resources/assets/mekanismtools/models/item/SteelSword.json index 865b1e10e..e09f269fa 100644 --- a/src/main/resources/assets/mekanismtools/models/item/SteelSword.json +++ b/src/main/resources/assets/mekanismtools/models/item/SteelSword.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/SteelSword" } diff --git a/src/main/resources/assets/mekanismtools/models/item/StonePaxel.json b/src/main/resources/assets/mekanismtools/models/item/StonePaxel.json index d346f4592..8f041a767 100644 --- a/src/main/resources/assets/mekanismtools/models/item/StonePaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/StonePaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/StonePaxel" } diff --git a/src/main/resources/assets/mekanismtools/models/item/WoodPaxel.json b/src/main/resources/assets/mekanismtools/models/item/WoodPaxel.json index d33307759..339657cc5 100644 --- a/src/main/resources/assets/mekanismtools/models/item/WoodPaxel.json +++ b/src/main/resources/assets/mekanismtools/models/item/WoodPaxel.json @@ -1,5 +1,5 @@ { - "parent": "mekanism:item/standard_item", + "parent": "item/handheld", "textures": { "layer0": "mekanismtools:items/WoodPaxel" } From f00b35a017688248908d6b615b1cbbbd5b210752 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 5 Aug 2016 16:44:30 -0400 Subject: [PATCH 14/16] Fixed Infusing Factory losing infuse storage, implement CTM model caching --- .../java/mekanism/client/render/ctm/CTM.java | 28 ++- .../render/ctm/CTMBlockRenderContext.java | 27 +++ .../client/render/ctm/CTMConnections.java | 182 ++++++++++++++++++ .../client/render/ctm/CTMModelFactory.java | 103 ++++++---- .../client/render/ctm/CTMRegistry.java | 4 +- .../java/mekanism/client/render/ctm/Dir.java | 2 +- .../common/tile/TileEntityFactory.java | 1 + .../tile/TileEntityMetallurgicInfuser.java | 3 +- 8 files changed, 311 insertions(+), 39 deletions(-) create mode 100644 src/main/java/mekanism/client/render/ctm/CTMConnections.java diff --git a/src/main/java/mekanism/client/render/ctm/CTM.java b/src/main/java/mekanism/client/render/ctm/CTM.java index 78dd81c7f..e3cbb0ec6 100644 --- a/src/main/java/mekanism/client/render/ctm/CTM.java +++ b/src/main/java/mekanism/client/render/ctm/CTM.java @@ -12,6 +12,7 @@ import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; import java.util.EnumMap; +import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; @@ -157,6 +158,19 @@ public class CTM { return submapCache; } + public int[] createSubmapIndices(long data, EnumFacing side){ + submapCache = new int[] { 18, 19, 17, 16 }; + + buildConnectionMap(data, side); + + // Map connections to submap indeces + for (int i = 0; i < 4; i++) { + fillSubmaps(i); + } + + return submapCache; + } + public int[] getSubmapIndices() { return submapCache; } @@ -174,6 +188,18 @@ public class CTM { connectionMap.put(dir, dir.isConnected(this, world, pos, side, state)); } } + + public void buildConnectionMap(long data, EnumFacing side){ + for (Dir dir : Dir.VALUES){ + connectionMap.put(dir, false); + } + List connections = CTMConnections.decode(data); + for (CTMConnections loc : connections){ + if (loc.getDirForSide(side) != null){ + connectionMap.put(loc.getDirForSide(side), true); + } + } + } private void fillSubmaps(int idx) { Dir[] dirs = submapMap.get(idx); @@ -298,7 +324,7 @@ public class CTM { return ret; } - public IBlockState getBlockOrFacade(IBlockAccess world, BlockPos pos, EnumFacing side) { + public static IBlockState getBlockOrFacade(IBlockAccess world, BlockPos pos, EnumFacing side) { IBlockState state = world.getBlockState(pos); return state; } diff --git a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java index 624d3483a..26e437bee 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java +++ b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java @@ -6,9 +6,17 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import org.apache.commons.lang3.ArrayUtils; + +import static mekanism.client.render.ctm.CTMConnections.*; + public class CTMBlockRenderContext { + private static final CTMConnections[] CACHED_LOCATIONS = ArrayUtils.removeElements(CTMConnections.VALUES, UP_UP, DOWN_DOWN, EAST_EAST, WEST_WEST, NORTH_NORTH, SOUTH_SOUTH); + private EnumMap ctmData = new EnumMap<>(EnumFacing.class); + + private long data; public CTMBlockRenderContext(IBlockAccess world, BlockPos pos) { @@ -18,6 +26,20 @@ public class CTMBlockRenderContext ctm.createSubmapIndices(world, pos, face); ctmData.put(face, ctm); } + + data = CTMConnections.getData(world, pos, CACHED_LOCATIONS); + } + + public CTMBlockRenderContext(long d) + { + data = d; + + for(EnumFacing face : EnumFacing.VALUES) + { + CTM ctm = createCTM(); + ctm.createSubmapIndices(data, face); + ctmData.put(face, ctm); + } } protected CTM createCTM() @@ -29,4 +51,9 @@ public class CTMBlockRenderContext { return ctmData.get(face); } + + public long serialize() + { + return data; + } } diff --git a/src/main/java/mekanism/client/render/ctm/CTMConnections.java b/src/main/java/mekanism/client/render/ctm/CTMConnections.java new file mode 100644 index 000000000..3a3d718a9 --- /dev/null +++ b/src/main/java/mekanism/client/render/ctm/CTMConnections.java @@ -0,0 +1,182 @@ +package mekanism.client.render.ctm; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.MekanismAPI; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +/** + * Represents all the different spot for connection locations for a ctm block + */ +public enum CTMConnections +{ + UP(Dir.TOP), + DOWN(Dir.BOTTOM), + NORTH(EnumFacing.EAST, Dir.RIGHT), + SOUTH(EnumFacing.EAST, Dir.LEFT), + EAST(Dir.RIGHT), + WEST(Dir.LEFT), + + NORTH_EAST(EnumFacing.UP, Dir.TOP_RIGHT), + NORTH_WEST(EnumFacing.UP, Dir.TOP_LEFT), + SOUTH_EAST(EnumFacing.UP, Dir.BOTTOM_RIGHT), + SOUTH_WEST(EnumFacing.UP, Dir.BOTTOM_LEFT), + + NORTH_UP(EnumFacing.EAST, Dir.TOP_RIGHT), + NORTH_DOWN(EnumFacing.EAST, Dir.BOTTOM_RIGHT), + SOUTH_UP(EnumFacing.EAST, Dir.TOP_LEFT), + SOUTH_DOWN(EnumFacing.EAST, Dir.BOTTOM_LEFT), + + EAST_UP(Dir.TOP_RIGHT), + EAST_DOWN(Dir.BOTTOM_RIGHT), + WEST_UP(Dir.TOP_LEFT), + WEST_DOWN(Dir.BOTTOM_LEFT), + + NORTH_EAST_UP(EnumFacing.EAST, Dir.TOP_RIGHT, true), + NORTH_EAST_DOWN(EnumFacing.EAST, Dir.BOTTOM_RIGHT, true), + + SOUTH_EAST_UP(EnumFacing.EAST, Dir.TOP_LEFT, true), + SOUTH_EAST_DOWN(EnumFacing.EAST, Dir.BOTTOM_LEFT, true), + + SOUTH_WEST_UP(EnumFacing.WEST, Dir.TOP_LEFT, true), + SOUTH_WEST_DOWN(EnumFacing.WEST, Dir.BOTTOM_LEFT, true), + + NORTH_WEST_UP(EnumFacing.WEST, Dir.TOP_RIGHT, true), + NORTH_WEST_DOWN(EnumFacing.WEST, Dir.BOTTOM_RIGHT, true), + + UP_UP(EnumFacing.UP, null, true), + DOWN_DOWN(EnumFacing.DOWN, null, true), + NORTH_NORTH(EnumFacing.NORTH, null, true), + SOUTH_SOUTH(EnumFacing.SOUTH, null, true), + EAST_EAST(EnumFacing.EAST, null, true), + WEST_WEST(EnumFacing.WEST, null, true), + + ; + + public static final CTMConnections[] VALUES = values(); + + /** + * The enum facing directions needed to get to this connection location + */ + private EnumFacing normal; + private Dir dir; + private boolean offset; + + private CTMConnections(Dir dir) { + this(EnumFacing.SOUTH, dir); + } + + private CTMConnections(Dir dir, boolean offset) { + this(EnumFacing.SOUTH, dir, offset); + } + + private CTMConnections(EnumFacing normal, Dir dir){ + this(normal, dir, false); + } + + private CTMConnections(EnumFacing normal, Dir dir, boolean offset) { + this.normal = normal; + this.dir = dir; + this.offset = offset; + } + + public Dir getDirForSide(EnumFacing facing){ + return dir == null ? null : dir;//TODO .relativize() + } + + public EnumFacing clipOrDestroy(EnumFacing direction) { + EnumFacing[] dirs = dir == null ? new EnumFacing[] {normal, normal} : dir.getNormalizedDirs(direction); + if (dirs[0] == direction) { + return dirs.length > 1 ? dirs[1] : null; + } else if (dirs.length > 1 && dirs[1] == direction) { + return dirs[0]; + } else { + return null; + } + } + + public BlockPos transform(BlockPos pos) { + if (dir != null) { + for (EnumFacing facing : dir.getNormalizedDirs(normal)) { + pos = pos.offset(facing); + } + } else { + pos = pos.offset(normal); + } + + if (offset) { + pos = pos.offset(normal); + } + return pos; + } + + public static CTMConnections fromFacing(EnumFacing facing){ + switch (facing){ + case NORTH: return NORTH; + case SOUTH: return SOUTH; + case EAST: return EAST; + case WEST: return WEST; + case UP: return UP; + case DOWN: return DOWN; + default: return NORTH; + } + } + + public static EnumFacing toFacing(CTMConnections loc){ + switch (loc){ + case NORTH: return EnumFacing.NORTH; + case SOUTH: return EnumFacing.SOUTH; + case EAST: return EnumFacing.EAST; + case WEST: return EnumFacing.WEST; + case UP: return EnumFacing.UP; + case DOWN: return EnumFacing.DOWN; + default: return EnumFacing.NORTH; + } + } + + public static List decode(long data) { + List list = new ArrayList<>(); + for (CTMConnections loc : values()) { + if ((1 & (data >> loc.ordinal())) != 0) { + list.add(loc); + } + } + return list; + } + + public long getMask(){ + return 1 << ordinal(); + } + + public static List getConnections(IBlockAccess world, BlockPos pos, CTMConnections[] values){ + List locs = new ArrayList<>(); + IBlockState state = world.getBlockState(pos); + for (CTMConnections loc : values) { + BlockPos second = loc.transform(pos); + if (state.equals(CTM.getBlockOrFacade(world, second, null))){ + locs.add(loc); + } + } + return locs; + } + + public static long getData(IBlockAccess world, BlockPos pos, CTMConnections[] values){ + List locs = getConnections(world, pos, values); + long data = 0; + for (CTMConnections loc : locs){ + data = data | loc.getMask(); + } + if (MekanismAPI.debug) { + String s = Long.toBinaryString(data); + while (s.length() < 32) { + s = "0" + s; + } + System.out.println(pos + ": " + s); + } + return data; + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index ba35df7f8..274bb9119 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -1,8 +1,10 @@ package mekanism.client.render.ctm; -import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.vecmath.Matrix4f; @@ -20,43 +22,48 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import org.apache.commons.lang3.tuple.Pair; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.MultimapBuilder; +import com.google.common.collect.Table; +import com.google.common.collect.Tables; /** - * Model for all chisel blocks + * Model for all CTM blocks, credit to Chisel */ @SuppressWarnings("deprecation") public class CTMModelFactory implements IPerspectiveAwareModel { - private List face; - private List general; + private ListMultimap genQuads = MultimapBuilder.enumKeys(BlockRenderLayer.class).arrayListValues().build(); + private Table> faceQuads = Tables.newCustomTable(Maps.newEnumMap(BlockRenderLayer.class), () -> Maps.newEnumMap(EnumFacing.class)); private ModelCTM model; private CTMOverride override = new CTMOverride(); - public CTMModelFactory(List f, List g, ModelCTM m) + public CTMModelFactory(ModelCTM m) { - face = f; - general = g; model = m; } - - public CTMModelFactory(ModelCTM model) - { - this(Collections.emptyList(), Collections.emptyList(), model); - } - + + private static Cache ctmCache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).maximumSize(500).build(); + @Override public List getQuads(IBlockState stateIn, EnumFacing side, long rand) { @@ -65,14 +72,29 @@ public class CTMModelFactory implements IPerspectiveAwareModel if(stateIn != null && stateIn.getBlock() instanceof ICTMBlock && stateIn instanceof IExtendedBlockState) { IExtendedBlockState state = (IExtendedBlockState)stateIn; + IBlockState clean = state.getClean(); CTMBlockRenderContext ctxList = state.getValue(BlockStateBasic.ctmProperty); - baked = createModel(stateIn, model, ctxList); + + try { + if(ctxList == null) + { + baked = ctmCache.get(Objects.hash(clean, -1), () -> createModel(state, model, null)); + } + else { + long serialized = ctxList.serialize(); + baked = ctmCache.get(Objects.hash(clean, serialized), () -> createModel(state, model, ctxList)); + } + } catch(Exception e) { + e.printStackTrace(); + return Lists.newArrayList(); + } } else { baked = this; } - return side == null ? baked.general : FluentIterable.from(baked.face).filter(quad -> quad.getFace() == side).toList(); + BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); + return side == null ? baked.genQuads.get(layer) : layer == null ? baked.faceQuads.column(side).values().stream().flatMap(List::stream).collect(Collectors.toList()) : baked.faceQuads.get(layer, side); } @Override @@ -107,33 +129,48 @@ public class CTMModelFactory implements IPerspectiveAwareModel private CTMModelFactory createModel(IBlockState state, ModelCTM model, CTMBlockRenderContext ctx) { - List faceQuads = Lists.newArrayList(); - List generalQuads = Lists.newArrayList(); + CTMModelFactory ret = new CTMModelFactory(model); + IBakedModel baked = model.getModel(state); + int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE; + List quads = Lists.newArrayList(); - for(EnumFacing facing : EnumFacing.VALUES) + for(BlockRenderLayer layer : BlockRenderLayer.values()) { - TextureCTM face = model.getFace(facing); - ICTMBlock block = (ICTMBlock)state.getBlock(); - CTMData data = block.getCTMData(state); - - if(block.getOverrideTexture(state, facing) != null) - { - face = CTMRegistry.textureCache.get(block.getOverrideTexture(state, facing)); - } + for(EnumFacing facing : EnumFacing.VALUES) + { + TextureCTM face = model.getFace(facing); + + if(ctx == null || layer == face.layer) + { + ICTMBlock block = (ICTMBlock)state.getBlock(); + CTMData data = block.getCTMData(state); + + if(block.getOverrideTexture(state, facing) != null) + { + face = CTMRegistry.textureCache.get(block.getOverrideTexture(state, facing)); + } - int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE; - IBakedModel baked = model.getModel(state); - List origFaceQuads = baked.getQuads(state, facing, 0); - List origGeneralQuads = FluentIterable.from(baked.getQuads(state, null, 0)).filter(q -> q.getFace() == facing).toList(); - addAllQuads(origFaceQuads, face, ctx, state, quadGoal, faceQuads); - addAllQuads(origGeneralQuads, face, ctx, state, quadGoal, generalQuads); + List temp = baked.getQuads(state, facing, 0); + addAllQuads(temp, face, ctx, state, quadGoal, quads); + ret.faceQuads.put(layer, facing, ImmutableList.copyOf(quads)); + + temp = FluentIterable.from(baked.getQuads(state, null, 0)).filter(q -> q.getFace() == facing).toList(); + addAllQuads(temp, face, ctx, state, quadGoal, quads); + ret.genQuads.putAll(layer, temp); + } + else { + ret.faceQuads.put(layer, facing, Lists.newArrayList()); + } + } } - return new CTMModelFactory(faceQuads, generalQuads, model); + return ret; } private void addAllQuads(List from, TextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) { + to.clear(); + for(BakedQuad q : from) { to.addAll(tex.transformQuad(q, ctx == null ? null : ctx, quadGoal)); diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index 284ef222c..f1991c34e 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -75,10 +75,10 @@ public class CTMRegistry callbacks[0] = new TextureSpriteCallback(new ResourceLocation(domain + ":blocks/ctm/" + name)); callbacks[1] = new TextureSpriteCallback(new ResourceLocation(domain + ":blocks/ctm/" + name + "-ctm")); - + register(callbacks[0]); register(callbacks[1]); - return new TextureCTM(BlockRenderLayer.SOLID, callbacks); + return new TextureCTM(BlockRenderLayer.CUTOUT, callbacks); } } diff --git a/src/main/java/mekanism/client/render/ctm/Dir.java b/src/main/java/mekanism/client/render/ctm/Dir.java index b33d38458..f82c8f05d 100644 --- a/src/main/java/mekanism/client/render/ctm/Dir.java +++ b/src/main/java/mekanism/client/render/ctm/Dir.java @@ -90,7 +90,7 @@ public enum Dir { return connection; } - private EnumFacing[] getNormalizedDirs(EnumFacing normal) { + public EnumFacing[] getNormalizedDirs(EnumFacing normal) { if (normal == NORMAL) { return dirs; } else if (normal == NORMAL.getOpposite()) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index b81896bda..3a157f142 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -232,6 +232,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I factory.recipeType = recipeType; factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); factory.securityComponent.readFrom(securityComponent); + factory.infuseStored = infuseStored; for(int i = 0; i < tier.processes+5; i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index f5a6c9756..80ad13a3c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -255,8 +255,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } //Infuser - factory.infuseStored.amount = infuseStored.amount; - factory.infuseStored.type = infuseStored.type; + factory.infuseStored = infuseStored; factory.inventory[5] = inventory[2]; factory.inventory[1] = inventory[4]; From 770e127a757ab314bede58abe7c5e6874b95339d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 5 Aug 2016 20:45:40 -0400 Subject: [PATCH 15/16] Fixed IC2 crash --- src/main/java/mekanism/common/util/ChargeUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index 5fe2bc401..c3986ef6a 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -51,7 +51,7 @@ public final class ChargeUtils storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_RF)); } - else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) + else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) { storer.setEnergy(storer.getEnergy() + general.ENERGY_PER_REDSTONE); inv.getStackInSlot(slotID).stackSize--; @@ -155,7 +155,7 @@ public final class ChargeUtils return energyContainer.extractEnergy(itemstack, 1, true) > 0; } } - else if(itemstack.getItem() instanceof ISpecialElectricItem) + else if(MekanismUtils.useIC2() && itemstack.getItem() instanceof ISpecialElectricItem) { IElectricItemManager manager = ((ISpecialElectricItem)itemstack.getItem()).getManager(itemstack); From a9177a0989ef2f0d4cde6828cd55f9e6e42b6a5c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 5 Aug 2016 21:28:23 -0400 Subject: [PATCH 16/16] Bump version to 9.1.1 --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 ++-- .../java/mekanism/generators/common/MekanismGenerators.java | 4 ++-- src/main/java/mekanism/tools/common/MekanismTools.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index ca167bcdb..4f6e893a1 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ mappings_version=snapshot_20160627 forge_version=12.18.1.2014 mcmp_version=1.2.0_74 jei_version=3.7.6.231 -mod_version=9.1.0 +mod_version=9.1.1 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 565ed24b7..1aa39c1cb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -160,7 +160,7 @@ import com.mojang.authlib.GameProfile; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -186,7 +186,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 1, 0); + public static Version versionNumber = new Version(9, 1, 1); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f77957cba..ec3b5a76e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -44,7 +44,7 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -54,7 +54,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 1, 0); + public static Version versionNumber = new Version(9, 1, 1); public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index d7b9f80d2..d5c6d592c 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -42,7 +42,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 1, 0); + public static Version versionNumber = new Version(9, 1, 1); //Enums: Tools public static ToolMaterial toolOBSIDIAN;