diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index fa0c5a8e4..a8cc822bd 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1063,9 +1063,8 @@ public class ClientProxy extends CommonProxy CTMRegistry.registerCTMs("mekanism", "dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output", "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", - "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", - "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", - "electromagnetic_coil", "thermal_evaporation_valve", "thermal_evaporation_block", "turbine_casing", "turbine_vent", "turbine_valve"); + "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", + "boiler_casing", "boiler_valve", "thermal_evaporation_valve", "thermal_evaporation_block"); } @Override diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index faa341269..6527c1e13 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -83,7 +83,7 @@ public class MekanismKeyHandler extends MekKeyHandler if(player.isSneaking() && item instanceof ItemConfigurator) { ItemConfigurator configurator = (ItemConfigurator)item; - + int toSet = configurator.getState(toolStack).ordinal() < ConfiguratorMode.values().length-1 ? configurator.getState(toolStack).ordinal() + 1 : 0; configurator.setState(toolStack, ConfiguratorMode.values()[toSet]); Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(EnumHand.MAIN_HAND, configurator.getState(toolStack))); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 63d5fadf2..0d7acee5b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -505,6 +505,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY + || capability == Capabilities.CONFIGURABLE_CAPABILITY || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) || super.hasCapability(capability, facing); @@ -516,7 +517,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || - capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index b5827aec1..2c8dd6a53 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -146,7 +146,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy CTMRegistry.registerCTMs("mekanismgenerators", "turbine_vent", "turbine_valve", "turbine_casing", "electromagnetic_coil", "reactor_controller", "reactor_frame", "reactor_port", "reactor_port_output", "reactor_glass", "laser_focus_matrix", - "reactor_logic_adapter", "reactor_controller_on"); + "reactor_logic_adapter", "reactor_controller_on", "saturating_condenser"); } @Override diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 92a6c1dc6..3cb5d3db9 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -110,7 +110,7 @@ public class GeneratorsCommonProxy implements IGuiProvider generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt(); generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); - generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserRate", 8000).getInt(); + generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserFlowRate", 32000).getInt(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f52e994d6..f77957cba 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -158,7 +158,7 @@ public class MekanismGenerators implements IModule " I ", "IFI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Generator, 1, 10), Character.valueOf('F'), Blocks.IRON_BARS })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 13), new Object[] { - "STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('E'), Items.BUCKET + "STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('B'), Items.BUCKET })); //Reactor Recipes diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 47c82d694..326c5818d 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -22,6 +22,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import mekanism.generators.common.GeneratorsBlocks; @@ -121,6 +122,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock ctmData[10] = new CTMData(GeneratorType.TURBINE_CASING); ctmData[11] = new CTMData(GeneratorType.TURBINE_VALVE); ctmData[12] = new CTMData(GeneratorType.TURBINE_VENT); + ctmData[13] = new CTMData(GeneratorType.SATURATING_CONDENSER); break; } @@ -617,7 +619,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, state.getBlock().getMetaFromState(state)); - if(itemStack.getTagCompound() == null) + if(itemStack.getTagCompound() == null && !(tileEntity instanceof TileEntityMultiblock)) { itemStack.setTagCompound(new NBTTagCompound()); } @@ -644,7 +646,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock electricItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored); } - if(tileEntity instanceof TileEntityContainerBlock) + if(tileEntity instanceof TileEntityContainerBlock && ((TileEntityContainerBlock)tileEntity).handleInventory()) { ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); inventory.setInventory(((TileEntityContainerBlock)tileEntity).getInventory(), itemStack); diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png b/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png index ea0f39edf..0dd5a217f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png and b/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png differ diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/saturating_condenser.json b/src/main/resources/assets/mekanismgenerators/blockstates/saturating_condenser.json index 0129b1a66..cdc754f69 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/saturating_condenser.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/saturating_condenser.json @@ -3,7 +3,7 @@ "defaults": { "model": "mekanism:basic_cube", "textures": { - "all": "mekanismgenerators:blocks/saturating_condenser" + "all": "mekanismgenerators:blocks/ctm/saturating_condenser" } }, "variants": { diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png index 128faeb3e..081cb28e5 100644 Binary files a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png index 373b8c12a..3e38845f3 100644 Binary files a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm copy.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm copy.png deleted file mode 100644 index 128faeb3e..000000000 Binary files a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm copy.png and /dev/null differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm.png new file mode 100644 index 000000000..d8e53759a Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output.png index 373b8c12a..9919066e3 100644 Binary files a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output.png and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port_output.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser-ctm.png new file mode 100644 index 000000000..c1823f283 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser.png new file mode 100644 index 000000000..20c6ae1f4 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/saturating_condenser.png differ