From 4d5b1e4d77d6e109cbc0dff7569a6ece5f2bd421 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 13 Nov 2016 19:41:32 +0000 Subject: [PATCH] Issue3887 (#1) * Fixed gas auto-output * Fixed Dynamic Tank logic issue, changed transmitter redstone sensitivity to off by default * Fixed tesla crash * Bump version to 9.2.1 * Add a check to prevent render exception * Increase MCMP version to latest * Account for meta in the JEI ISubtypeInterpreter I think an old JEI was using meta + the `ISubtypeInterpreter`, but it was not intended, and JEI does not do that now. Right now, if you look up Mekanism stuff in JEI it shows all kinds of blocks instead of just the intended block. This PR fixes the Mekanism `ISubtypeInterpreter` so that it differentiates machines and basic blocks again. * Fixed homeLocation write * Fix for issue #3887 --- build.properties | 4 +-- .../java/mekanism/client/jei/MekanismJEI.java | 6 ++-- .../transmitter/RenderMechanicalPipe.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +-- .../mekanism/common/entity/EntityRobit.java | 5 +++- .../common/integration/TeslaIntegration.java | 3 +- .../common/multipart/PartSidedPipe.java | 7 ++++- .../TileEntityChemicalDissolutionChamber.java | 13 ++------ .../tile/TileEntityChemicalInfuser.java | 13 ++------ .../tile/TileEntityChemicalOxidizer.java | 14 ++------- .../common/tile/TileEntityChemicalWasher.java | 13 ++------ .../common/tile/TileEntityDynamicTank.java | 2 +- .../tile/TileEntityElectrolyticSeparator.java | 30 ++++--------------- .../tile/TileEntityRotaryCondensentrator.java | 13 ++------ .../tile/TileEntitySolarNeutronActivator.java | 12 ++------ .../generators/common/MekanismGenerators.java | 4 +-- .../mekanism/tools/common/MekanismTools.java | 4 +-- 17 files changed, 41 insertions(+), 108 deletions(-) diff --git a/build.properties b/build.properties index e0ed031bf..e26e3ba06 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_74 +mcmp_version=1.3.0_83 jei_version=3.7.6.231 -mod_version=9.2.0 +mod_version=9.2.1 diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index cb94d6ffe..62fd80d55 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -122,16 +122,16 @@ public class MekanismJEI implements IModPlugin @Override public String getSubtypeInfo(ItemStack itemStack) { - String ret = ""; + String ret = Integer.toString(itemStack.getMetadata()); if(itemStack.getItem() instanceof ITierItem) { - ret += ((ITierItem)itemStack.getItem()).getBaseTier(itemStack).getSimpleName(); + ret += ":" + ((ITierItem)itemStack.getItem()).getBaseTier(itemStack).getSimpleName(); } if(itemStack.getItem() instanceof IFactory) { - ret += RecipeType.values()[((IFactory)itemStack.getItem()).getRecipeType(itemStack)].getName(); + ret += ":" + RecipeType.values()[((IFactory)itemStack.getItem()).getRecipeType(itemStack)].getName(); } return ret.isEmpty() ? null : ret.toLowerCase(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index bef6919dc..417b465d6 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -68,7 +68,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase 0.01 && fluid != null) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 539b748bd..2442ee637 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.2.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.2.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, 2, 0); + public static Version versionNumber = new Version(9, 2, 1); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 0f3133ac2..124091cfe 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -437,7 +437,10 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine nbtTags.setBoolean("dropPickup", getDropPickup()); - homeLocation.write(nbtTags); + if(homeLocation != null) + { + homeLocation.write(nbtTags); + } NBTTagList tagList = new NBTTagList(); diff --git a/src/main/java/mekanism/common/integration/TeslaIntegration.java b/src/main/java/mekanism/common/integration/TeslaIntegration.java index b489b2cad..08cbd8a9a 100644 --- a/src/main/java/mekanism/common/integration/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/TeslaIntegration.java @@ -2,7 +2,6 @@ package mekanism.common.integration; import mekanism.api.MekanismConfig.general; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.tile.TileEntityElectricBlock; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; @@ -22,7 +21,7 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro public EnumFacing side; - public TeslaIntegration(TileEntityElectricBlock tile, EnumFacing facing) + public TeslaIntegration(IEnergyWrapper tile, EnumFacing facing) { tileEntity = tile; side = facing; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 23dc30484..c9e397255 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -72,7 +72,7 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud public boolean sendDesc = false; public boolean redstonePowered = false; - public boolean redstoneReactive = true; + public boolean redstoneReactive = false; public boolean forceUpdate = true; @@ -939,4 +939,9 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud return name().toLowerCase(); } } + + @Override + public boolean shouldBreakingUseExtendedState() { + return true; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index f69dbf05b..d8fd64398 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -16,6 +16,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; +import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; @@ -39,7 +40,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -169,16 +169,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri if(outputTank.getGas() != null) { GasStack toSend = new GasStack(outputTank.getGas().getGas(), Math.min(outputTank.getStored(), gasOutput)); - - TileEntity tileEntity = Coord4D.get(this).offset(MekanismUtils.getRight(facing)).getTileEntity(worldObj); - - if(tileEntity instanceof IGasHandler) - { - if(((IGasHandler)tileEntity).canReceiveGas(MekanismUtils.getRight(facing).getOpposite(), outputTank.getGas().getGas())) - { - outputTank.draw(((IGasHandler)tileEntity).receiveGas(MekanismUtils.getRight(facing).getOpposite(), toSend, true), true); - } - } + outputTank.draw(GasTransmission.emit(toSend, this, ListUtils.asList(MekanismUtils.getRight(facing))), true); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 35d8bd6cf..2a08a98eb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -17,6 +17,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; +import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -39,7 +40,6 @@ import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraftforge.common.capabilities.Capability; @@ -152,16 +152,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl if(centerTank.getGas() != null) { GasStack toSend = new GasStack(centerTank.getGas().getGas(), Math.min(centerTank.getStored(), gasOutput)); - - TileEntity tileEntity = Coord4D.get(this).offset(facing).getTileEntity(worldObj); - - if(tileEntity instanceof IGasHandler) - { - if(((IGasHandler)tileEntity).canReceiveGas(facing.getOpposite(), centerTank.getGas().getGas())) - { - centerTank.draw(((IGasHandler)tileEntity).receiveGas(facing.getOpposite(), toSend, true), true); - } - } + centerTank.draw(GasTransmission.emit(toSend, this, ListUtils.asList(facing)), true); } prevEnergy = getEnergy(); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index dd00a1921..b917fad40 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -12,9 +12,9 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTransmission; -import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; +import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; @@ -36,7 +36,6 @@ import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraftforge.common.capabilities.Capability; @@ -148,16 +147,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp if(gasTank.getGas() != null) { GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), gasOutput)); - - TileEntity tileEntity = Coord4D.get(this).offset(MekanismUtils.getRight(facing)).getTileEntity(worldObj); - - if(tileEntity instanceof IGasHandler) - { - if(((IGasHandler)tileEntity).canReceiveGas(MekanismUtils.getRight(facing).getOpposite(), gasTank.getGas().getGas())) - { - gasTank.draw(((IGasHandler)tileEntity).receiveGas(MekanismUtils.getRight(facing).getOpposite(), toSend, true), true); - } - } + gasTank.draw(GasTransmission.emit(toSend, this, ListUtils.asList(MekanismUtils.getRight(facing))), true); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index db9ce4887..aa544a8e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -17,6 +17,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; +import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; @@ -45,7 +46,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraftforge.common.capabilities.Capability; @@ -159,16 +159,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple if(outputTank.getGas() != null) { GasStack toSend = new GasStack(outputTank.getGas().getGas(), Math.min(outputTank.getStored(), gasOutput)); - - TileEntity tileEntity = Coord4D.get(this).offset(MekanismUtils.getRight(facing)).getTileEntity(worldObj); - - if(tileEntity instanceof IGasHandler) - { - if(((IGasHandler)tileEntity).canReceiveGas(MekanismUtils.getRight(facing).getOpposite(), outputTank.getGas().getGas())) - { - outputTank.draw(((IGasHandler)tileEntity).receiveGas(MekanismUtils.getRight(facing).getOpposite(), toSend, true), true); - } - } + outputTank.draw(GasTransmission.emit(toSend, this, ListUtils.asList(MekanismUtils.getRight(facing))), true); } prevEnergy = getEnergy(); diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index f5c81ad62..8b301bdf6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -116,7 +116,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock 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 c6809ebcc..9180ca842 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.2.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.2.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, 2, 0); + public static Version versionNumber = new Version(9, 2, 1); //Enums: Tools public static ToolMaterial toolOBSIDIAN;