mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Better MekanismGenerators config GUI, removed reactor API, better reactor recipe management
This commit is contained in:
1 parent
b355b80cf4
commit
c7a74d239b
23 files changed
+129
-437
No files matched your search
@@ -1,66 +0,0 @@
|
||||
package mekanism.api.reactor;
|
||||
|
||||
import mekanism.api.IHeatTransfer;
|
||||
import mekanism.api.gas.GasTank;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
|
||||
public interface IFusionReactor extends IHeatTransfer
|
||||
{
|
||||
public void addTemperatureFromEnergyInput(double energyAdded);
|
||||
|
||||
public void simulate();
|
||||
|
||||
public FluidTank getWaterTank();
|
||||
|
||||
public FluidTank getSteamTank();
|
||||
|
||||
public GasTank getDeuteriumTank();
|
||||
|
||||
public GasTank getTritiumTank();
|
||||
|
||||
public GasTank getFuelTank();
|
||||
|
||||
public double getBufferedEnergy();
|
||||
|
||||
public void setBufferedEnergy(double energy);
|
||||
|
||||
public double getPlasmaTemp();
|
||||
|
||||
public void setPlasmaTemp(double temp);
|
||||
|
||||
public double getCaseTemp();
|
||||
|
||||
public void setCaseTemp(double temp);
|
||||
|
||||
public double getBufferSize();
|
||||
|
||||
public void formMultiblock(boolean keepBurning);
|
||||
|
||||
public boolean isFormed();
|
||||
|
||||
public void setInjectionRate(int rate);
|
||||
|
||||
public int getInjectionRate();
|
||||
|
||||
public boolean isBurning();
|
||||
|
||||
public void setBurning(boolean burn);
|
||||
|
||||
public int getMinInjectionRate(boolean active);
|
||||
|
||||
public double getMaxPlasmaTemperature(boolean active);
|
||||
|
||||
public double getMaxCasingTemperature(boolean active);
|
||||
|
||||
public double getIgnitionTemperature(boolean active);
|
||||
|
||||
public double getPassiveGeneration(boolean active, boolean current);
|
||||
|
||||
public int getSteamPerTick(boolean current);
|
||||
|
||||
public void updateTemperatures();
|
||||
|
||||
public NonNullList<ItemStack> getInventory();
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package mekanism.api.reactor;
|
||||
|
||||
public interface INeutronCapture extends IReactorBlock
|
||||
{
|
||||
public int absorbNeutrons(int neutrons);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package mekanism.api.reactor;
|
||||
|
||||
public interface IReactorBlock
|
||||
{
|
||||
public boolean isFrame();
|
||||
|
||||
public void setReactor(IFusionReactor reactor);
|
||||
|
||||
public IFusionReactor getReactor();
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|reactor")
|
||||
package mekanism.api.reactor;
|
||||
import net.minecraftforge.fml.common.API;
|
||||
|
||||
@@ -57,6 +57,7 @@ import mekanism.common.entity.EntityObsidianTNT;
|
||||
import mekanism.common.entity.EntityRobit;
|
||||
import mekanism.common.frequency.Frequency;
|
||||
import mekanism.common.frequency.FrequencyManager;
|
||||
import mekanism.common.integration.IMCHandler;
|
||||
import mekanism.common.integration.MekanismHooks;
|
||||
import mekanism.common.integration.OreDictManager;
|
||||
import mekanism.common.integration.multipart.MultipartMekanism;
|
||||
|
||||
+2
-1
@@ -1,7 +1,8 @@
|
||||
package mekanism.common;
|
||||
package mekanism.common.integration;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.recipe.RecipeHandler;
|
||||
import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.ShapedMekanismRecipe;
|
||||
+1
-1
@@ -11,7 +11,6 @@ import mekanism.api.Range4D;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.util.CapabilityUtils;
|
||||
import mekanism.common.ColourRGBA;
|
||||
import mekanism.common.HeatNetwork;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Tier;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
@@ -20,6 +19,7 @@ import mekanism.common.block.states.BlockStateTransmitter;
|
||||
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.transmitters.grid.HeatNetwork;
|
||||
import mekanism.common.util.HeatUtils;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mekanism.common;
|
||||
package mekanism.common.transmitters.grid;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
@@ -8,7 +8,6 @@ import mekanism.generators.client.gui.GuiBioGenerator;
|
||||
import mekanism.generators.client.gui.GuiGasGenerator;
|
||||
import mekanism.generators.client.gui.GuiHeatGenerator;
|
||||
import mekanism.generators.client.gui.GuiIndustrialTurbine;
|
||||
import mekanism.generators.client.gui.GuiNeutronCapture;
|
||||
import mekanism.generators.client.gui.GuiReactorController;
|
||||
import mekanism.generators.client.gui.GuiReactorFuel;
|
||||
import mekanism.generators.client.gui.GuiReactorHeat;
|
||||
@@ -42,7 +41,6 @@ import mekanism.generators.common.tile.TileEntitySolarGenerator;
|
||||
import mekanism.generators.common.tile.TileEntityWindGenerator;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
|
||||
import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing;
|
||||
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
|
||||
import mekanism.generators.common.tile.turbine.TileEntityTurbineValve;
|
||||
@@ -112,10 +110,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
|
||||
|
||||
for(ReactorBlockType type : ReactorBlockType.values())
|
||||
{
|
||||
if(type.isValidReactorBlock())
|
||||
{
|
||||
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanismgenerators:" + type.getName(), "inventory"));
|
||||
}
|
||||
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanismgenerators:" + type.getName(), "inventory"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,8 +173,6 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
|
||||
return new GuiReactorFuel(player.inventory, (TileEntityReactorController)tileEntity);
|
||||
case 13:
|
||||
return new GuiReactorStats(player.inventory, (TileEntityReactorController)tileEntity);
|
||||
case 14:
|
||||
return new GuiNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity);
|
||||
case 15:
|
||||
return new GuiReactorLogicAdapter(player.inventory, (TileEntityReactorLogicAdapter)tileEntity);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
package mekanism.generators.client.gui;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraftforge.common.config.ConfigElement;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement;
|
||||
import net.minecraftforge.fml.client.config.GuiConfig;
|
||||
import net.minecraftforge.fml.client.config.GuiConfigEntries;
|
||||
import net.minecraftforge.fml.client.config.GuiConfigEntries.CategoryEntry;
|
||||
import net.minecraftforge.fml.client.config.IConfigElement;
|
||||
|
||||
/**
|
||||
* Created by ben on 27/06/14.
|
||||
@@ -12,7 +21,66 @@ public class GuiGeneratorsConfig extends GuiConfig
|
||||
{
|
||||
public GuiGeneratorsConfig(GuiScreen parent)
|
||||
{
|
||||
super(parent, new ConfigElement(Mekanism.configuration.getCategory("generation")).getChildElements(),
|
||||
"MekanismGenerators", false, false, "MekanismGenerators");
|
||||
super(parent, getConfigElements(), "MekanismGenerators", false, false, "MekanismGenerators");
|
||||
}
|
||||
|
||||
private static List<IConfigElement> getConfigElements()
|
||||
{
|
||||
List<IConfigElement> list = new ArrayList<IConfigElement>();
|
||||
list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.general"), "mekanism.configgui.ctgy.generators.general", GeneralEntry.class));
|
||||
list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.generators"), "mekanism.configgui.ctgy.generators.generators", GeneratorsEntry.class));
|
||||
list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.generation"), "mekanism.configgui.ctgy.generators.generation", GenerationEntry.class));
|
||||
return list;
|
||||
}
|
||||
|
||||
public static class GeneralEntry extends CategoryEntry
|
||||
{
|
||||
public GeneralEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop)
|
||||
{
|
||||
super(owningScreen, owningEntryList, prop);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected GuiScreen buildChildScreen()
|
||||
{
|
||||
return new GuiConfig(owningScreen,
|
||||
new ConfigElement(Mekanism.configuration.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(),
|
||||
owningScreen.modID, Configuration.CATEGORY_GENERAL, false, false,
|
||||
GuiConfig.getAbridgedConfigPath(Mekanism.configuration.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
public static class GeneratorsEntry extends CategoryEntry
|
||||
{
|
||||
public GeneratorsEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop)
|
||||
{
|
||||
super(owningScreen, owningEntryList, prop);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected GuiScreen buildChildScreen()
|
||||
{
|
||||
return new GuiConfig(owningScreen,
|
||||
new ConfigElement(Mekanism.configuration.getCategory("generators")).getChildElements(),
|
||||
owningScreen.modID, Configuration.CATEGORY_GENERAL, false, false,
|
||||
GuiConfig.getAbridgedConfigPath(Mekanism.configuration.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
public static class GenerationEntry extends CategoryEntry
|
||||
{
|
||||
public GenerationEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop)
|
||||
{
|
||||
super(owningScreen, owningEntryList, prop);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected GuiScreen buildChildScreen()
|
||||
{
|
||||
return new GuiConfig(owningScreen,
|
||||
new ConfigElement(Mekanism.configuration.getCategory("generation")).getChildElements(),
|
||||
owningScreen.modID, Configuration.CATEGORY_GENERAL, false, false,
|
||||
GuiConfig.getAbridgedConfigPath(Mekanism.configuration.toString()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
package mekanism.generators.client.gui;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.gui.GuiMekanism;
|
||||
import mekanism.client.gui.element.GuiElement.IInfoHandler;
|
||||
import mekanism.client.gui.element.GuiEnergyInfo;
|
||||
import mekanism.client.gui.element.GuiPowerBar;
|
||||
import mekanism.client.gui.element.GuiRedstoneControl;
|
||||
import mekanism.client.gui.element.GuiSlot;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotOverlay;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotType;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import mekanism.generators.common.inventory.container.ContainerNeutronCapture;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiNeutronCapture extends GuiMekanism
|
||||
{
|
||||
public TileEntityReactorNeutronCapture tileEntity;
|
||||
|
||||
public GuiNeutronCapture(InventoryPlayer inventory, TileEntityReactorNeutronCapture tentity)
|
||||
{
|
||||
super(new ContainerNeutronCapture(inventory, tentity));
|
||||
tileEntity = tentity;
|
||||
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
|
||||
guiElements.add(new GuiEnergyInfo(new IInfoHandler()
|
||||
{
|
||||
@Override
|
||||
public List<String> getInfo()
|
||||
{
|
||||
return ListUtils.asList(
|
||||
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
|
||||
LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
|
||||
guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 164, 15));
|
||||
guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 142, 34).with(SlotOverlay.POWER));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
|
||||
{
|
||||
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
|
||||
|
||||
fontRendererObj.drawString(tileEntity.getName(), 30, 6, 0x404040);
|
||||
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
|
||||
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
|
||||
{
|
||||
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"));
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
int guiWidth = (width - xSize) / 2;
|
||||
int guiHeight = (height - ySize) / 2;
|
||||
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
|
||||
|
||||
super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import static java.lang.Math.max;
|
||||
import static java.lang.Math.min;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
@@ -13,15 +12,13 @@ import mekanism.api.Coord4D;
|
||||
import mekanism.api.IHeatTransfer;
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.api.gas.GasTank;
|
||||
import mekanism.api.reactor.IFusionReactor;
|
||||
import mekanism.api.reactor.INeutronCapture;
|
||||
import mekanism.api.reactor.IReactorBlock;
|
||||
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
|
||||
import mekanism.common.LaserManager;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismFluids;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.generators.common.item.ItemHohlraum;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorBlock;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
@@ -36,11 +33,10 @@ import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
|
||||
public class FusionReactor implements IFusionReactor
|
||||
public class FusionReactor
|
||||
{
|
||||
public TileEntityReactorController controller;
|
||||
public Set<IReactorBlock> reactorBlocks = new HashSet<IReactorBlock>();
|
||||
public Set<INeutronCapture> neutronCaptors = new HashSet<INeutronCapture>();
|
||||
public Set<TileEntityReactorBlock> reactorBlocks = new HashSet<TileEntityReactorBlock>();
|
||||
public Set<IHeatTransfer> heatTransfers = new HashSet<IHeatTransfer>();
|
||||
|
||||
//Current stores of temperature - internally uses ambient-relative kelvin units
|
||||
@@ -83,7 +79,6 @@ public class FusionReactor implements IFusionReactor
|
||||
controller = c;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTemperatureFromEnergyInput(double energyAdded)
|
||||
{
|
||||
plasmaTemperature += energyAdded / plasmaHeatCapacity * (isBurning() ? 1 : 10);
|
||||
@@ -105,7 +100,6 @@ public class FusionReactor implements IFusionReactor
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void simulate()
|
||||
{
|
||||
if(controller.getWorld().isRemote)
|
||||
@@ -132,7 +126,6 @@ public class FusionReactor implements IFusionReactor
|
||||
{
|
||||
injectFuel();
|
||||
int fuelBurned = burnFuel();
|
||||
neutronFlux(fuelBurned);
|
||||
|
||||
if(fuelBurned == 0)
|
||||
{
|
||||
@@ -155,7 +148,6 @@ public class FusionReactor implements IFusionReactor
|
||||
updateTemperatures();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateTemperatures()
|
||||
{
|
||||
lastPlasmaTemperature = plasmaTemperature < 1E-1 ? 0 : plasmaTemperature;
|
||||
@@ -195,25 +187,6 @@ public class FusionReactor implements IFusionReactor
|
||||
return fuelBurned;
|
||||
}
|
||||
|
||||
public void neutronFlux(int fuelBurned)
|
||||
{
|
||||
int neutronsRemaining = fuelBurned;
|
||||
List<INeutronCapture> list = new ArrayList<INeutronCapture>(neutronCaptors);
|
||||
Collections.shuffle(list);
|
||||
|
||||
for(INeutronCapture captor: neutronCaptors)
|
||||
{
|
||||
if(neutronsRemaining <= 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
neutronsRemaining = captor.absorbNeutrons(neutronsRemaining);
|
||||
}
|
||||
|
||||
controller.radiateNeutrons(neutronsRemaining);
|
||||
}
|
||||
|
||||
public void transferHeat()
|
||||
{
|
||||
//Transfer from plasma to casing
|
||||
@@ -252,73 +225,61 @@ public class FusionReactor implements IFusionReactor
|
||||
setBufferedEnergy(getBufferedEnergy() + caseAirHeat * thermocoupleEfficiency);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTank getWaterTank()
|
||||
{
|
||||
return controller != null ? controller.waterTank : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTank getSteamTank()
|
||||
{
|
||||
return controller.steamTank;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GasTank getDeuteriumTank()
|
||||
{
|
||||
return controller.deuteriumTank;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GasTank getTritiumTank()
|
||||
{
|
||||
return controller.tritiumTank;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GasTank getFuelTank()
|
||||
{
|
||||
return controller.fuelTank;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBufferedEnergy()
|
||||
{
|
||||
return controller.getEnergy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBufferedEnergy(double energy)
|
||||
{
|
||||
controller.setEnergy(energy);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getPlasmaTemp()
|
||||
{
|
||||
return lastPlasmaTemperature;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlasmaTemp(double temp)
|
||||
{
|
||||
plasmaTemperature = temp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getCaseTemp()
|
||||
{
|
||||
return lastCaseTemperature;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCaseTemp(double temp)
|
||||
{
|
||||
caseTemperature = temp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBufferSize()
|
||||
{
|
||||
return controller.getMaxEnergy();
|
||||
@@ -337,7 +298,7 @@ public class FusionReactor implements IFusionReactor
|
||||
|
||||
public void unformMultiblock(boolean keepBurning)
|
||||
{
|
||||
for(IReactorBlock block : reactorBlocks)
|
||||
for(TileEntityReactorBlock block : reactorBlocks)
|
||||
{
|
||||
block.setReactor(null);
|
||||
}
|
||||
@@ -345,7 +306,6 @@ public class FusionReactor implements IFusionReactor
|
||||
//Don't remove from controller
|
||||
controller.setReactor(this);
|
||||
reactorBlocks.clear();
|
||||
neutronCaptors.clear();
|
||||
formed = false;
|
||||
burning = burning && keepBurning;
|
||||
|
||||
@@ -355,7 +315,6 @@ public class FusionReactor implements IFusionReactor
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void formMultiblock(boolean keepBurning)
|
||||
{
|
||||
updatedThisTick = true;
|
||||
@@ -407,10 +366,10 @@ public class FusionReactor implements IFusionReactor
|
||||
{
|
||||
TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorld());
|
||||
|
||||
if(tile instanceof IReactorBlock && ((IReactorBlock)tile).isFrame())
|
||||
if(tile instanceof TileEntityReactorBlock && ((TileEntityReactorBlock)tile).isFrame())
|
||||
{
|
||||
reactorBlocks.add((IReactorBlock)tile);
|
||||
((IReactorBlock)tile).setReactor(this);
|
||||
reactorBlocks.add((TileEntityReactorBlock)tile);
|
||||
((TileEntityReactorBlock)tile).setReactor(this);
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
@@ -440,15 +399,10 @@ public class FusionReactor implements IFusionReactor
|
||||
return false;
|
||||
}
|
||||
|
||||
if(tile instanceof IReactorBlock)
|
||||
if(tile instanceof TileEntityReactorBlock)
|
||||
{
|
||||
reactorBlocks.add((IReactorBlock)tile);
|
||||
((IReactorBlock)tile).setReactor(this);
|
||||
|
||||
if(tile instanceof INeutronCapture)
|
||||
{
|
||||
neutronCaptors.add((INeutronCapture)tile);
|
||||
}
|
||||
reactorBlocks.add((TileEntityReactorBlock)tile);
|
||||
((TileEntityReactorBlock)tile).setReactor(this);
|
||||
|
||||
if(tile instanceof IHeatTransfer)
|
||||
{
|
||||
@@ -486,13 +440,11 @@ public class FusionReactor implements IFusionReactor
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFormed()
|
||||
{
|
||||
return formed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInjectionRate(int rate)
|
||||
{
|
||||
injectionRate = rate;
|
||||
@@ -513,25 +465,21 @@ public class FusionReactor implements IFusionReactor
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInjectionRate()
|
||||
{
|
||||
return injectionRate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isBurning()
|
||||
{
|
||||
return burning;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBurning(boolean burn)
|
||||
{
|
||||
burning = burn;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMinInjectionRate(boolean active)
|
||||
{
|
||||
double k = active ? caseWaterConductivity : 0;
|
||||
@@ -539,28 +487,24 @@ public class FusionReactor implements IFusionReactor
|
||||
return (int)(2 * Math.ceil(aMin/2D));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxPlasmaTemperature(boolean active)
|
||||
{
|
||||
double k = active ? caseWaterConductivity : 0;
|
||||
return injectionRate * energyPerFuel/plasmaCaseConductivity * (plasmaCaseConductivity+k+caseAirConductivity) / (k+caseAirConductivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxCasingTemperature(boolean active)
|
||||
{
|
||||
double k = active ? caseWaterConductivity : 0;
|
||||
return injectionRate * energyPerFuel / (k+caseAirConductivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getIgnitionTemperature(boolean active)
|
||||
{
|
||||
double k = active ? caseWaterConductivity : 0;
|
||||
return burnTemperature * energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getPassiveGeneration(boolean active, boolean current)
|
||||
{
|
||||
double temperature = current ? caseTemperature : getMaxCasingTemperature(active);
|
||||
@@ -568,7 +512,6 @@ public class FusionReactor implements IFusionReactor
|
||||
return thermocoupleEfficiency * caseAirConductivity * temperature;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSteamPerTick(boolean current)
|
||||
{
|
||||
double temperature = current ? caseTemperature : getMaxCasingTemperature(true);
|
||||
@@ -576,37 +519,31 @@ public class FusionReactor implements IFusionReactor
|
||||
return (int)(steamTransferEfficiency * caseWaterConductivity * temperature / enthalpyOfVaporization);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getTemp()
|
||||
{
|
||||
return lastCaseTemperature;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getInverseConductionCoefficient()
|
||||
{
|
||||
return 1 / caseAirConductivity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getInsulationCoefficient(EnumFacing side)
|
||||
{
|
||||
return 100000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void transferHeatTo(double heat)
|
||||
{
|
||||
heatToAbsorb += heat;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double[] simulateHeat()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double applyTemperatureChange()
|
||||
{
|
||||
caseTemperature += heatToAbsorb / caseHeatCapacity;
|
||||
@@ -615,19 +552,16 @@ public class FusionReactor implements IFusionReactor
|
||||
return caseTemperature;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectHeat(EnumFacing side)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IHeatTransfer getAdjacent(EnumFacing side)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NonNullList<ItemStack> getInventory()
|
||||
{
|
||||
return isFormed() ? controller.inventory : null;
|
||||
|
||||
@@ -6,12 +6,10 @@ import mekanism.common.base.IGuiProvider;
|
||||
import mekanism.common.inventory.container.ContainerFilter;
|
||||
import mekanism.common.inventory.container.ContainerNull;
|
||||
import mekanism.common.tile.TileEntityContainerBlock;
|
||||
import mekanism.generators.common.block.states.BlockStateGenerator;
|
||||
import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType;
|
||||
import mekanism.generators.common.inventory.container.ContainerBioGenerator;
|
||||
import mekanism.generators.common.inventory.container.ContainerGasGenerator;
|
||||
import mekanism.generators.common.inventory.container.ContainerHeatGenerator;
|
||||
import mekanism.generators.common.inventory.container.ContainerNeutronCapture;
|
||||
import mekanism.generators.common.inventory.container.ContainerReactorController;
|
||||
import mekanism.generators.common.inventory.container.ContainerSolarGenerator;
|
||||
import mekanism.generators.common.inventory.container.ContainerWindGenerator;
|
||||
@@ -26,7 +24,6 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorFrame;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorGlass;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorPort;
|
||||
import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil;
|
||||
import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex;
|
||||
@@ -57,7 +54,6 @@ public class GeneratorsCommonProxy implements IGuiProvider
|
||||
GameRegistry.registerTileEntity(TileEntityReactorFrame.class, "ReactorFrame");
|
||||
GameRegistry.registerTileEntity(TileEntityReactorGlass.class, "ReactorGlass");
|
||||
GameRegistry.registerTileEntity(TileEntityReactorLaserFocusMatrix.class, "ReactorLaserFocus");
|
||||
GameRegistry.registerTileEntity(TileEntityReactorNeutronCapture.class, "ReactorNeutronCapture");
|
||||
GameRegistry.registerTileEntity(TileEntityReactorPort.class, "ReactorPort");
|
||||
GameRegistry.registerTileEntity(TileEntityReactorLogicAdapter.class, "ReactorLogicAdapter");
|
||||
GameRegistry.registerTileEntity(TileEntityRotationalComplex.class, "RotationalComplex");
|
||||
@@ -171,8 +167,6 @@ public class GeneratorsCommonProxy implements IGuiProvider
|
||||
case 12:
|
||||
case 13:
|
||||
return new ContainerNull(player, (TileEntityContainerBlock)tileEntity);
|
||||
case 14:
|
||||
return new ContainerNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity);
|
||||
case 15:
|
||||
return new ContainerNull(player, (TileEntityContainerBlock)tileEntity);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package mekanism.generators.common;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.MekanismConfig.generators;
|
||||
@@ -25,8 +24,8 @@ import mekanism.common.network.PacketSimpleGui;
|
||||
import mekanism.common.recipe.RecipeHandler;
|
||||
import mekanism.common.recipe.ShapedMekanismRecipe;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.generators.common.block.states.BlockStateGenerator;
|
||||
import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType;
|
||||
import mekanism.generators.common.block.states.BlockStateReactor.ReactorBlockType;
|
||||
import mekanism.generators.common.content.turbine.SynchronizedTurbineData;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -169,23 +168,23 @@ public class MekanismGenerators implements IModule
|
||||
}));
|
||||
|
||||
//Reactor Recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 4, 1), new Object[] {
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.REACTOR_FRAME.getStack(4), new Object[] {
|
||||
" C ", "CAC", " C ", Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('A'), "alloyUltimate"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 2, 3), new Object[] {
|
||||
" I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE)
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.REACTOR_PORT.getStack(2), new Object[] {
|
||||
" I ", "ICI", " I ", Character.valueOf('I'), ReactorBlockType.REACTOR_FRAME.getStack(1), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 4, 0), new Object[] {
|
||||
" I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('G'), "blockGlass"
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.REACTOR_GLASS.getStack(4), new Object[] {
|
||||
" I ", "IGI", " I ", Character.valueOf('I'), ReactorBlockType.REACTOR_FRAME.getStack(1), Character.valueOf('G'), "blockGlass"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 0), new Object[] {
|
||||
"CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.REACTOR_CONTROLLER.getStack(1), new Object[] {
|
||||
"CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), ReactorBlockType.REACTOR_FRAME.getStack(1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 2, 1), new Object[] {
|
||||
" I ", "ILI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.ReactorGlass, 1, 0), Character.valueOf('L'), "blockRedstone"
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.LASER_FOCUS_MATRIX.getStack(2), new Object[] {
|
||||
" I ", "ILI", " I ", Character.valueOf('I'), ReactorBlockType.REACTOR_GLASS.getStack(1), Character.valueOf('L'), "blockRedstone"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 4), new Object[] {
|
||||
" R ", "RFR", " R ", Character.valueOf('R'), "dustRedstone", Character.valueOf('F'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1)
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(ReactorBlockType.REACTOR_LOGIC_ADAPTER.getStack(1), new Object[] {
|
||||
" R ", "RFR", " R ", Character.valueOf('R'), "dustRedstone", Character.valueOf('F'), ReactorBlockType.REACTOR_FRAME.getStack(1)
|
||||
}));
|
||||
|
||||
FuelHandler.addGas(MekanismFluids.Ethene, general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
|
||||
|
||||
@@ -95,11 +95,11 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock
|
||||
switch(getReactorBlock())
|
||||
{
|
||||
case REACTOR_BLOCK:
|
||||
ctmData[0] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[1] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[2] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[3] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[4] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[0] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[1] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[2] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[3] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
ctmData[4] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER);
|
||||
|
||||
break;
|
||||
case REACTOR_GLASS:
|
||||
@@ -221,7 +221,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock
|
||||
{
|
||||
for(BlockStateReactor.ReactorBlockType type : BlockStateReactor.ReactorBlockType.values())
|
||||
{
|
||||
if(type.blockType == getReactorBlock() && type.isValidReactorBlock())
|
||||
if(type.blockType == getReactorBlock())
|
||||
{
|
||||
list.add(new ItemStack(item, 1, type.meta));
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorFrame;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorGlass;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorPort;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
@@ -81,7 +80,7 @@ public class BlockStateReactor extends ExtendedBlockState
|
||||
@Override
|
||||
public boolean apply(ReactorBlockType input)
|
||||
{
|
||||
return input.blockType == basicBlock && input.isValidReactorBlock();
|
||||
return input.blockType == basicBlock;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,9 +88,8 @@ public class BlockStateReactor extends ExtendedBlockState
|
||||
{
|
||||
REACTOR_CONTROLLER(ReactorBlock.REACTOR_BLOCK, 0, "ReactorController", 10, TileEntityReactorController.class, false),
|
||||
REACTOR_FRAME(ReactorBlock.REACTOR_BLOCK, 1, "ReactorFrame", -1, TileEntityReactorFrame.class, false),
|
||||
NEUTRON_CAPTURE(ReactorBlock.REACTOR_BLOCK, 2, "ReactorNeutronCapturePlate", 14, TileEntityReactorNeutronCapture.class, false),
|
||||
REACTOR_PORT(ReactorBlock.REACTOR_BLOCK, 3, "ReactorPort", -1, TileEntityReactorPort.class, false),
|
||||
REACTOR_LOGIC_ADAPTER(ReactorBlock.REACTOR_BLOCK, 4, "ReactorLogicAdapter", 15, TileEntityReactorLogicAdapter.class, false),
|
||||
REACTOR_PORT(ReactorBlock.REACTOR_BLOCK, 2, "ReactorPort", -1, TileEntityReactorPort.class, false),
|
||||
REACTOR_LOGIC_ADAPTER(ReactorBlock.REACTOR_BLOCK, 3, "ReactorLogicAdapter", 15, TileEntityReactorLogicAdapter.class, false),
|
||||
REACTOR_GLASS(ReactorBlock.REACTOR_GLASS, 0, "ReactorGlass", -1, TileEntityReactorGlass.class, false),
|
||||
LASER_FOCUS_MATRIX(ReactorBlock.REACTOR_GLASS, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class, true);
|
||||
|
||||
@@ -111,11 +109,6 @@ public class BlockStateReactor extends ExtendedBlockState
|
||||
tileEntityClass = tileClass;
|
||||
activable = activeState;
|
||||
}
|
||||
|
||||
public boolean isValidReactorBlock()
|
||||
{
|
||||
return this != NEUTRON_CAPTURE;
|
||||
}
|
||||
|
||||
public static ReactorBlockType get(Block block, int meta)
|
||||
{
|
||||
@@ -167,9 +160,9 @@ public class BlockStateReactor extends ExtendedBlockState
|
||||
return LangUtils.localize("tooltip." + name);
|
||||
}
|
||||
|
||||
public ItemStack getStack()
|
||||
public ItemStack getStack(int amount)
|
||||
{
|
||||
return new ItemStack(blockType.getBlock(), 1, meta);
|
||||
return new ItemStack(blockType.getBlock(), amount, meta);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-123
@@ -1,123 +0,0 @@
|
||||
package mekanism.generators.common.inventory.container;
|
||||
|
||||
import mekanism.common.inventory.slot.SlotEnergy.SlotCharge;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ContainerNeutronCapture extends Container
|
||||
{
|
||||
private TileEntityReactorNeutronCapture tileEntity;
|
||||
|
||||
public ContainerNeutronCapture(InventoryPlayer inventory, TileEntityReactorNeutronCapture tentity)
|
||||
{
|
||||
tileEntity = tentity;
|
||||
addSlotToContainer(new SlotCharge(tentity, 0, 143, 35));
|
||||
int slotX;
|
||||
|
||||
for(slotX = 0; slotX < 3; ++slotX)
|
||||
{
|
||||
for(int slotY = 0; slotY < 9; ++slotY)
|
||||
{
|
||||
addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18));
|
||||
}
|
||||
}
|
||||
|
||||
for(slotX = 0; slotX < 9; ++slotX)
|
||||
{
|
||||
addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142));
|
||||
}
|
||||
|
||||
tileEntity.openInventory(inventory.player);
|
||||
tileEntity.open(inventory.player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(EntityPlayer entityplayer)
|
||||
{
|
||||
super.onContainerClosed(entityplayer);
|
||||
|
||||
tileEntity.closeInventory(entityplayer);
|
||||
tileEntity.close(entityplayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer)
|
||||
{
|
||||
return tileEntity.isUsableByPlayer(entityplayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int slotID)
|
||||
{
|
||||
ItemStack stack = ItemStack.EMPTY;
|
||||
Slot currentSlot = (Slot)inventorySlots.get(slotID);
|
||||
|
||||
if(currentSlot != null && currentSlot.getHasStack())
|
||||
{
|
||||
ItemStack slotStack = currentSlot.getStack();
|
||||
stack = slotStack.copy();
|
||||
|
||||
if(ChargeUtils.canBeCharged(slotStack))
|
||||
{
|
||||
if(slotID != 0)
|
||||
{
|
||||
if(!mergeItemStack(slotStack, 0, 1, false))
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
else if(slotID == 0)
|
||||
{
|
||||
if(!mergeItemStack(slotStack, 1, inventorySlots.size(), false))
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(slotID >= 1 && slotID <= 27)
|
||||
{
|
||||
if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false))
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
else if(slotID > 27)
|
||||
{
|
||||
if(!mergeItemStack(slotStack, 1, 27, false))
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true))
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(slotStack.getCount() == 0)
|
||||
{
|
||||
currentSlot.putStack(ItemStack.EMPTY);
|
||||
}
|
||||
else {
|
||||
currentSlot.onSlotChanged();
|
||||
}
|
||||
|
||||
if(slotStack.getCount() == stack.getCount())
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
currentSlot.onTake(player, slotStack);
|
||||
}
|
||||
|
||||
return stack;
|
||||
}
|
||||
}
|
||||
@@ -5,16 +5,15 @@ import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.reactor.IFusionReactor;
|
||||
import mekanism.api.reactor.IReactorBlock;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.generators.common.FusionReactor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
public abstract class TileEntityReactorBlock extends TileEntityElectricBlock implements IReactorBlock
|
||||
public abstract class TileEntityReactorBlock extends TileEntityElectricBlock
|
||||
{
|
||||
public IFusionReactor fusionReactor;
|
||||
public FusionReactor fusionReactor;
|
||||
|
||||
public boolean attempted;
|
||||
|
||||
@@ -25,14 +24,15 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp
|
||||
super("ReactorBlock", 0);
|
||||
inventory = NonNullList.withSize(0, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
public abstract boolean isFrame();
|
||||
|
||||
public TileEntityReactorBlock(String name, double maxEnergy)
|
||||
{
|
||||
super(name, maxEnergy);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setReactor(IFusionReactor reactor)
|
||||
public void setReactor(FusionReactor reactor)
|
||||
{
|
||||
if(reactor != fusionReactor)
|
||||
{
|
||||
@@ -42,8 +42,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp
|
||||
fusionReactor = reactor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFusionReactor getReactor()
|
||||
public FusionReactor getReactor()
|
||||
{
|
||||
return fusionReactor;
|
||||
}
|
||||
|
||||
@@ -65,7 +65,6 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen
|
||||
inventory = NonNullList.withSize(1, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFrame()
|
||||
{
|
||||
return false;
|
||||
|
||||
-1
@@ -44,7 +44,6 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFrame()
|
||||
{
|
||||
return false;
|
||||
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
package mekanism.generators.common.tile.reactor;
|
||||
|
||||
import mekanism.api.reactor.INeutronCapture;
|
||||
|
||||
public class TileEntityReactorNeutronCapture extends TileEntityReactorBlock implements INeutronCapture
|
||||
{
|
||||
@Override
|
||||
public boolean isFrame()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int absorbNeutrons(int neutrons)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,6 @@ import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.api.gas.IGasHandler;
|
||||
import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.api.reactor.IReactorBlock;
|
||||
import mekanism.api.util.CapabilityUtils;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismFluids;
|
||||
@@ -370,7 +369,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
|
||||
|
||||
if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()))
|
||||
{
|
||||
if(!(adj instanceof IReactorBlock))
|
||||
if(!(adj instanceof TileEntityReactorBlock))
|
||||
{
|
||||
return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user