From a23243cd023fcc08a352a7f07658de8082d2757d Mon Sep 17 00:00:00 2001 From: Gig Date: Tue, 12 May 2015 00:17:17 +0100 Subject: [PATCH] Added ChemicalReactor --- .../blocks/machine/BlockChemicalReactor.java | 17 +++ .../java/techreborn/client/GuiHandler.java | 14 ++- .../container/ContainerChemicalReactor.java | 55 +++++++++ .../client/gui/GuiChemicalReactor.java | 52 ++++++++ .../java/techreborn/compat/nei/NEIConfig.java | 5 + .../recipes/ChemicalReactorRecipeHandler.java | 47 +++++++ src/main/java/techreborn/init/ModBlocks.java | 2 + src/main/java/techreborn/init/ModRecipes.java | 4 + .../recipes/ChemicalReactorRecipe.java | 18 +++ .../techreborn/tiles/TileChemicalReactor.java | 115 ++++++++++++++++++ 10 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 src/main/java/techreborn/client/container/ContainerChemicalReactor.java create mode 100644 src/main/java/techreborn/client/gui/GuiChemicalReactor.java create mode 100644 src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java create mode 100644 src/main/java/techreborn/recipes/ChemicalReactorRecipe.java create mode 100644 src/main/java/techreborn/tiles/TileChemicalReactor.java diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index ce8c75f27..c613b9d0e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -18,6 +18,7 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileChemicalReactor; import techreborn.tiles.TileMachineCasing; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -38,6 +39,22 @@ public class BlockChemicalReactor extends BlockMachineBase { super(material); setBlockName("techreborn.chemicalreactor"); } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) + { + return new TileChemicalReactor(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, + EntityPlayer player, int side, float hitX, float hitY, float hitZ) + { + if (!player.isSneaking()) + player.openGui(Core.INSTANCE, GuiHandler.chemicalReactorID, world, x, y, + z); + return true; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index c1b7a1383..deeb476ee 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -8,6 +8,7 @@ import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerAssemblingMachine; import techreborn.client.container.ContainerBlastFurnace; import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChemicalReactor; import techreborn.client.container.ContainerChunkloader; import techreborn.client.container.ContainerDieselGenerator; import techreborn.client.container.ContainerGrinder; @@ -27,6 +28,7 @@ import techreborn.client.gui.GuiAlloySmelter; import techreborn.client.gui.GuiAssemblingMachine; import techreborn.client.gui.GuiBlastFurnace; import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChemicalReactor; import techreborn.client.gui.GuiChunkLoader; import techreborn.client.gui.GuiDieselGenerator; import techreborn.client.gui.GuiGrinder; @@ -47,6 +49,7 @@ import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileAssemblingMachine; import techreborn.tiles.TileBlastFurnace; import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChemicalReactor; import techreborn.tiles.TileChunkLoader; import techreborn.tiles.TileDieselGenerator; import techreborn.tiles.TileGrinder; @@ -84,6 +87,7 @@ public class GuiHandler implements IGuiHandler { public static final int aesuID =17; public static final int alloyFurnaceID = 18; public static final int sawMillID = 19; + public static final int chemicalReactorID = 20; @@ -166,7 +170,11 @@ public class GuiHandler implements IGuiHandler { } else if (ID == sawMillID) { return new ContainerIndustrialSawmill( - (TileIndustrialSawmill) world.getTileEntity(x, y, z), player); + (TileIndustrialSawmill) world.getTileEntity(x, y, z), player); + } else if (ID == chemicalReactorID) + { + return new ContainerChemicalReactor( + (TileChemicalReactor) world.getTileEntity(x, y, z), player); } else if (ID == pdaID) { return null; @@ -255,6 +263,10 @@ public class GuiHandler implements IGuiHandler { { return new GuiIndustrialSawmill(player, (TileIndustrialSawmill) world.getTileEntity(x, y, z)); + } else if (ID == chemicalReactorID) + { + return new GuiChemicalReactor(player, + (TileChemicalReactor) world.getTileEntity(x, y, z)); } else if (ID == pdaID) { return new GuiPda(player); diff --git a/src/main/java/techreborn/client/container/ContainerChemicalReactor.java b/src/main/java/techreborn/client/container/ContainerChemicalReactor.java new file mode 100644 index 000000000..6feff4f88 --- /dev/null +++ b/src/main/java/techreborn/client/container/ContainerChemicalReactor.java @@ -0,0 +1,55 @@ +package techreborn.client.container; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import techreborn.client.SlotOutput; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileChemicalReactor; + +public class ContainerChemicalReactor extends TechRebornContainer { + + EntityPlayer player; + + TileChemicalReactor tile; + + @Override + public boolean canInteractWith(EntityPlayer player) + { + return true; + } + + public int tickTime; + + public ContainerChemicalReactor(TileChemicalReactor tilechemicalReactor, + EntityPlayer player) + { + tile = tilechemicalReactor; + this.player = player; + + // input + this.addSlotToContainer(new Slot(tilechemicalReactor.inventory, 0, 70, 21)); + this.addSlotToContainer(new Slot(tilechemicalReactor.inventory, 1, 90, 21)); + // outputs + this.addSlotToContainer(new SlotOutput(tilechemicalReactor.inventory, 2, 80, 51)); + //TODO battery Slot + + int i; + + for (i = 0; i < 3; ++i) + { + for (int j = 0; j < 9; ++j) + { + this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (i = 0; i < 9; ++i) + { + this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, + 142)); + } + } + +} diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java new file mode 100644 index 000000000..d298c229f --- /dev/null +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -0,0 +1,52 @@ +package techreborn.client.gui; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileChemicalReactor; + +public class GuiChemicalReactor extends GuiContainer { + + private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/chemical_reactor.png"); + + TileChemicalReactor chemicalReactor; + + public GuiChemicalReactor(EntityPlayer player, TileChemicalReactor tilechemicalReactor) { + super(new ContainerChemicalReactor(tilechemicalReactor, player)); + this.xSize = 176; + this.ySize = 167; + chemicalReactor = tilechemicalReactor; + } + + @Override + public void initGui() { + this.buttonList.clear(); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.buttonList.add(new GuiButton(0, k + 4, l + 4, 20, 20, "R")); + super.initGui(); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + this.mc.getTextureManager().bindTexture(texture); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + } + + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + String name = StatCollector.translateToLocal("tile.techreborn.chemicalReactor.name"); + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); + } +} diff --git a/src/main/java/techreborn/compat/nei/NEIConfig.java b/src/main/java/techreborn/compat/nei/NEIConfig.java index 0c3f5419c..12cd7babf 100644 --- a/src/main/java/techreborn/compat/nei/NEIConfig.java +++ b/src/main/java/techreborn/compat/nei/NEIConfig.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import scala.tools.nsc.backend.icode.analysis.TypeFlowAnalysis; import techreborn.compat.nei.recipes.AlloySmelterRecipeHandler; import techreborn.compat.nei.recipes.AssemblingMachineRecipeHandler; +import techreborn.compat.nei.recipes.ChemicalReactorRecipeHandler; import techreborn.compat.nei.recipes.GenericRecipeHander; import techreborn.compat.nei.recipes.ImplosionCompressorRecipeHandler; import techreborn.compat.nei.recipes.IndustrialSawmillRecipeHandler; @@ -65,6 +66,10 @@ public class NEIConfig implements IConfigureNEI { PlateCuttingMachineRecipeHandler plate = new PlateCuttingMachineRecipeHandler(); API.registerUsageHandler(plate); API.registerRecipeHandler(plate); + + ChemicalReactorRecipeHandler chem = new ChemicalReactorRecipeHandler(); + API.registerUsageHandler(chem); + API.registerRecipeHandler(chem); API.registerRecipeHandler(centrifugeRecipeHandler); API.registerUsageHandler(centrifugeRecipeHandler); diff --git a/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java new file mode 100644 index 000000000..89598f32a --- /dev/null +++ b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java @@ -0,0 +1,47 @@ +package techreborn.compat.nei.recipes; + +import codechicken.nei.PositionedStack; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraftforge.oredict.OreDictionary; +import techreborn.api.recipe.IBaseRecipeType; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.util.ItemUtils; + +import java.util.List; + +public class ChemicalReactorRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { + @Override + public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { + int offset = 4; + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 70 - offset, 21 - offset); + input.add(pStack); + + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 90 - offset, 21 - offset); + input.add(pStack2); + + PositionedStack pStack3 = new PositionedStack(recipeType.getOutputs().get(0), 80 - offset, 51 - offset); + outputs.add(pStack3); + } + + @Override + public String getRecipeName() { + return "chemicalReactorRecipe"; + } + + @Override + public String getGuiTexture() { + return "techreborn:textures/gui/chemical_reactor.png"; + } + + @Override + public Class getGuiClass() { + return GuiChemicalReactor.class; + } + + @Override + public INeiBaseRecipe getNeiBaseRecipe() { + return this; + } +} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 517304235..fc7458b21 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -59,6 +59,7 @@ import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileAssemblingMachine; import techreborn.tiles.TileBlastFurnace; import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChemicalReactor; import techreborn.tiles.TileChunkLoader; import techreborn.tiles.TileDieselGenerator; import techreborn.tiles.TileDragonEggSiphoner; @@ -215,6 +216,7 @@ public class ModBlocks { ChemicalReactor = new BlockChemicalReactor(Material.rock); GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor"); + GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactor"); lathe = new BlockLathe(Material.rock); GameRegistry.registerBlock(lathe, "lathe"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 9f8ece759..32e3c1511 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -9,9 +9,11 @@ import techreborn.api.BlastFurnaceRecipe; import techreborn.api.CentrifugeRecipie; import techreborn.api.TechRebornAPI; import techreborn.api.recipe.RecipeHanderer; +import techreborn.compat.nei.recipes.ChemicalReactorRecipeHandler; import techreborn.config.ConfigTechReborn; import techreborn.recipes.AlloySmelterRecipe; import techreborn.recipes.AssemblingMachineRecipe; +import techreborn.recipes.ChemicalReactorRecipe; import techreborn.recipes.ImplosionCompressorRecipe; import techreborn.recipes.IndustrialSawmillRecipe; import techreborn.recipes.LatheRecipe; @@ -207,6 +209,8 @@ public class ModRecipes { RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond) , 120, 5)); RecipeHanderer.addRecipe(new PlateCuttingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); + //TODO + RecipeHanderer.addRecipe(new ChemicalReactorRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); LogHelper.info("Machine Recipes Added"); } diff --git a/src/main/java/techreborn/recipes/ChemicalReactorRecipe.java b/src/main/java/techreborn/recipes/ChemicalReactorRecipe.java new file mode 100644 index 000000000..cd0244d63 --- /dev/null +++ b/src/main/java/techreborn/recipes/ChemicalReactorRecipe.java @@ -0,0 +1,18 @@ +package techreborn.recipes; + +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.BaseRecipe; + +public class ChemicalReactorRecipe extends BaseRecipe { + + public ChemicalReactorRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) + { + super("chemicalReactorRecipe", tickTime, euPerTick); + if(input1 != null) + inputs.add(input1); + if(input2 != null) + inputs.add(input2); + if(output1 != null) + outputs.add(output1); + } +} diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java new file mode 100644 index 000000000..674825806 --- /dev/null +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -0,0 +1,115 @@ +package techreborn.tiles; + +import ic2.api.energy.prefab.BasicSink; +import ic2.api.energy.tile.IEnergyTile; +import ic2.api.tile.IWrenchable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import techreborn.api.recipe.RecipeCrafter; +import techreborn.config.ConfigTechReborn; +import techreborn.init.ModBlocks; +import techreborn.util.Inventory; + +public class TileChemicalReactor extends TileMachineBase implements IWrenchable, IEnergyTile { + + public int tickTime; + public BasicSink energy; + public Inventory inventory = new Inventory(3, "TileChemicalReactor", 64); + public RecipeCrafter crafter; + + public TileChemicalReactor() + { + //TODO configs + energy = new BasicSink(this, 1000, 2); + //Input slots + int[] inputs = new int[2]; + inputs[0] = 0; + inputs[1] = 1; + int[] outputs = new int[1]; + outputs[0] = 2; + crafter = new RecipeCrafter("chemicalReactorRecipe", this, energy, 2, 2, inventory, inputs, outputs); + } + + @Override + public void updateEntity() + { + super.updateEntity(); + energy.updateEntity(); + crafter.updateEntity(); + } + + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) + { + return false; + } + + @Override + public short getFacing() + { + return 0; + } + + @Override + public void setFacing(short facing) + { + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) + { + if (entityPlayer.isSneaking()) + { + return true; + } + return false; + } + + @Override + public float getWrenchDropRate() + { + return 1.0F; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) + { + return new ItemStack(ModBlocks.ChemicalReactor, 1); + } + + public boolean isComplete() + { + return false; + } + + @Override + public void readFromNBT(NBTTagCompound tagCompound) + { + super.readFromNBT(tagCompound); + inventory.readFromNBT(tagCompound); + energy.readFromNBT(tagCompound); + crafter.readFromNBT(tagCompound); + } + + @Override + public void writeToNBT(NBTTagCompound tagCompound) + { + super.writeToNBT(tagCompound); + inventory.writeToNBT(tagCompound); + energy.writeToNBT(tagCompound); + crafter.writeToNBT(tagCompound); + } + + @Override + public void invalidate() + { + energy.invalidate(); + } + @Override + public void onChunkUnload() + { + energy.onChunkUnload(); + } + +}