diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index f9fb1cc07..1eb80a921 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -851,6 +851,7 @@ public class ModBlocks { public static Block rbmk_console; public static final int guiID_rbmk_rod = 113; public static final int guiID_rbmk_boiler = 114; + public static final int guiID_rbmk_control = 115; public static Block book_guide; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java index 835ccc360..1a4d23e8d 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java @@ -1,9 +1,14 @@ package com.hbm.blocks.machine.rbmk; import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; +import com.hbm.main.MainRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public abstract class RBMKBase extends BlockDummyable { @@ -20,6 +25,24 @@ public abstract class RBMKBase extends BlockDummyable { public int getOffset() { return 0; } + + public boolean openInv(World world, int x, int y, int z, EntityPlayer player, int gui) { + + if(world.isRemote) { + return true; + + } else if(!player.isSneaking()) { + int[] pos = this.findCore(world, x, y, z); + + if(pos == null) + return false; + + FMLNetworkHandler.openGui(player, MainRegistry.instance, gui, world, pos[0], pos[1], pos[2]); + return true; + } else { + return true; + } + } public static int renderIDRods = RenderingRegistry.getNextAvailableRenderId(); public static int renderIDPassive = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java index ba1203e19..ce51f17bb 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java @@ -22,21 +22,7 @@ public class RBMKBoiler extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - - if(world.isRemote) { - return true; - - } else if(!player.isSneaking()) { - int[] pos = this.findCore(world, x, y, z); - - if(pos == null) - return false; - - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rbmk_boiler, world, pos[0], pos[1], pos[2]); - return true; - } else { - return true; - } + return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_boiler); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java index 4934afb52..4ee7f60cf 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java @@ -1,7 +1,9 @@ package com.hbm.blocks.machine.rbmk; +import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -12,6 +14,11 @@ public class RBMKControl extends RBMKBase { return new TileEntityRBMKControl(); } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_control); + } + @Override public int getRenderType(){ return this.renderIDControl; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java index daa6bd7f4..a4fb8a483 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java @@ -22,21 +22,7 @@ public class RBMKRod extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - - if(world.isRemote) { - return true; - - } else if(!player.isSneaking()) { - int[] pos = this.findCore(world, x, y, z); - - if(pos == null) - return false; - - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rbmk_rod, world, pos[0], pos[1], pos[2]); - return true; - } else { - return true; - } + return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_rod); } @Override diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index a99880597..10cce240f 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -799,6 +799,13 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_rbmk_control: { + if(entity instanceof TileEntityRBMKControl) { + return new ContainerRBMKControl(player.inventory, (TileEntityRBMKControl) entity); + } + return null; + } } // NON-TE CONTAINERS @@ -1585,6 +1592,13 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_rbmk_control: { + if(entity instanceof TileEntityRBMKControl) { + return new GUIRBMKControl(player.inventory, (TileEntityRBMKControl) entity); + } + return null; + } } // ITEM GUIS diff --git a/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java b/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java new file mode 100644 index 000000000..4ee555b29 --- /dev/null +++ b/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java @@ -0,0 +1,46 @@ +package com.hbm.inventory.container; + +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBoiler; +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl; + +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 ContainerRBMKControl extends Container { + + private TileEntityRBMKControl rbmk; + + public ContainerRBMKControl(InventoryPlayer invPlayer, TileEntityRBMKControl tedf) { + rbmk = tedf; + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 20)); + } + } + + for(int i = 0; i < 9; i++) { + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 20)); + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if(var4 != null && var4.getHasStack()) { + return null; + } + + return var3; + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return rbmk.isUseableByPlayer(player); + } +} diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKControl.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKControl.java new file mode 100644 index 000000000..dbf67d440 --- /dev/null +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKControl.java @@ -0,0 +1,43 @@ +package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.container.ContainerRBMKBoiler; +import com.hbm.inventory.container.ContainerRBMKControl; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUIRBMKControl extends GuiContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/reactors/gui_rbmk_control.png"); + private TileEntityRBMKControl rod; + + public GUIRBMKControl(InventoryPlayer invPlayer, TileEntityRBMKControl tedf) { + super(new ContainerRBMKControl(invPlayer, tedf)); + rod = tedf; + + this.xSize = 176; + this.ySize = 186; + } + + @Override + protected void drawGuiContainerForegroundLayer(int i, int j) { + String name = this.rod.hasCustomInventoryName() ? this.rod.getInventoryName() : I18n.format(this.rod.getInventoryName()); + + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } +} diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 8953e4fa3..9464c2e15 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -277,6 +277,8 @@ public class ModItems { public static Item powder_lead; public static Item powder_neptunium; public static Item powder_polonium; + public static Item powder_co60; + public static Item powder_au198; public static Item powder_schrabidium; public static Item powder_schrabidate; @@ -2272,8 +2274,8 @@ public class ModItems { ingot_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.ingot).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix"); ingot_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.ingot).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); ingot_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.ingot, true).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium"); - ingot_co60 = new ItemHazard().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60"); - ingot_au198 = new ItemHazard().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); + ingot_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.ingot).addFire(5).toItem().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60"); + ingot_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.ingot).addFire(15).toItem().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium"); ingot_cobalt = new Item().setUnlocalizedName("ingot_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cobalt"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur"); @@ -2350,8 +2352,8 @@ public class ModItems { billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix"); billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium"); billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium"); - billet_co60 = new ItemHazard().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60"); - billet_au198 = new ItemHazard().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); + billet_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.billet).addFire(5).toItem().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60"); + billet_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.billet).addFire(15).toItem().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); billet_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); billet_solinium = new ItemHazard(ItemHazard.sa327 * ItemHazard.billet, false, true).setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium"); billet_australium = new ItemHazard().setUnlocalizedName("billet_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium"); @@ -2433,8 +2435,8 @@ public class ModItems { nugget_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.nugget).setUnlocalizedName("nugget_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu_mix"); nugget_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.nugget).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium"); nugget_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.nugget, true).setUnlocalizedName("nugget_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_polonium"); - nugget_co60 = new ItemHazard().setUnlocalizedName("nugget_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_co60"); - nugget_au198 = new ItemHazard().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); + nugget_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.nugget).addFire(5).toItem().setUnlocalizedName("nugget_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_co60"); + nugget_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.nugget).addFire(15).toItem().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium"); plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium"); wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper"); @@ -2481,6 +2483,8 @@ public class ModItems { powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lead"); powder_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.powder, true).setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.powder, true).setUnlocalizedName("powder_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_polonium"); + powder_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.powder).addFire(5).toItem().setUnlocalizedName("powder_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_co60"); + powder_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_au198"); powder_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); powder_schrabidate = new ItemHazard(ItemHazard.sa326 * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidate"); powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_aluminium"); @@ -4918,6 +4922,8 @@ public class ModItems { GameRegistry.registerItem(powder_plutonium, powder_plutonium.getUnlocalizedName()); GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName()); GameRegistry.registerItem(powder_polonium, powder_polonium.getUnlocalizedName()); + GameRegistry.registerItem(powder_co60, powder_co60.getUnlocalizedName()); + GameRegistry.registerItem(powder_au198, powder_au198.getUnlocalizedName()); GameRegistry.registerItem(powder_titanium, powder_titanium.getUnlocalizedName()); GameRegistry.registerItem(powder_copper, powder_copper.getUnlocalizedName()); GameRegistry.registerItem(powder_red_copper, powder_red_copper.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemHazard.java b/src/main/java/com/hbm/items/special/ItemHazard.java index e8e0ae87c..4116ecbf6 100644 --- a/src/main/java/com/hbm/items/special/ItemHazard.java +++ b/src/main/java/com/hbm/items/special/ItemHazard.java @@ -14,6 +14,7 @@ import net.minecraft.world.World; public class ItemHazard extends ItemCustomLore implements IItemHazard { + //CO60 5a α 015.00Rad/s Spicy //AU192 64h α 500.00Rad/s 2 much spice :( //PO210 138d α 025.00Rad/s Spicy //TH232 14,000,000,000a α 000.10Rad/s @@ -25,6 +26,7 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard { //PU239 24,000a α 005.00Rad/s //PU240 6,600a α 007.50Rad/s + public static final float co60 = 15.0F; public static final float au198 = 500.0F; public static final float po210 = 25.0F; public static final float th232 = 0.1F; diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKActiveBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKActiveBase.java index 830e04c01..5714d4c28 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKActiveBase.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKActiveBase.java @@ -1,5 +1,7 @@ package com.hbm.tileentity.machine.rbmk; +import net.minecraft.entity.player.EntityPlayer; + /** * Base class for all RBMK components that have a GUI * @author hbm @@ -8,4 +10,12 @@ package com.hbm.tileentity.machine.rbmk; public abstract class TileEntityRBMKActiveBase extends TileEntityRBMKBase { public abstract String getName(); + + public boolean isUseableByPlayer(EntityPlayer player) { + if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { + return false; + } else { + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 128; + } + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java index f4e6fcfae..acef36a3a 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java @@ -35,12 +35,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I @Override public void fillFluidInit(FluidType type) { - fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); - fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); - fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type); - fillFluid(this.xCoord, this.yCoord - 1, this.zCoord, getTact(), type); - fillFluid(this.xCoord, this.yCoord, this.zCoord + 1, getTact(), type); - fillFluid(this.xCoord, this.yCoord, this.zCoord - 1, getTact(), type); + fillFluid(this.xCoord, this.yCoord + 5, this.zCoord, getTact(), type); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java index e7ec4c053..0c12b85d3 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java @@ -1,6 +1,10 @@ package com.hbm.tileentity.machine.rbmk; -public class TileEntityRBMKControl extends TileEntityRBMKActiveBase { +public class TileEntityRBMKControl extends TileEntityRBMKSlottedBase { + + public TileEntityRBMKControl() { + super(0); + } @Override public String getName() { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java index 046697c8f..24448e4a8 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java @@ -77,15 +77,6 @@ public abstract class TileEntityRBMKSlottedBase extends TileEntityRBMKActiveBase return 64; } - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { - return false; - } else { - return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 128; - } - } - @Override public void openInventory() { } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 7a85e0ef9..801d7284d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -672,9 +672,12 @@ item.battery_su_l.name=Große Einwegbatterie item.battery_trixite.name=Billige Spark-Batterie-Nachmache item.beta.name=Beta-Features item.big_sword.name=Großes Schwert +item.billet_au198.name=Gold-198-Billet +item.billet_australium.name=Australiumbillet +item.billet_co60.name=Kobalt-60-Billet item.billet_mox_fuel.name=MOX-Kernbrennstoffbillet item.billet_neptunium.name=Neptuniumbillet -item.billet_polonium.name=Poloniumbillet +item.billet_polonium.name=Polonium-210-Billet item.billet_pu_mix.name=Reaktorfähiges Plutoniumbillet item.billet_pu238.name=Pu238-Billet item.billet_pu239.name=Pu239-Billet @@ -1350,7 +1353,7 @@ item.ingot_neptunium.name=Neptuniumbarren item.ingot_phosphorus.name=Weiße Phosphortafel item.ingot_plutonium.name=Plutoniumbarren item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren -item.ingot_polonium.name=Poloniumbarren +item.ingot_polonium.name=Polonium-210-Barren item.ingot_polymer.name=Polymertafel item.ingot_pu_mix.name=Reaktorfähiger Plutoniumbarren item.ingot_pu238.name=Pu238-Barren @@ -1662,8 +1665,10 @@ item.nuclear_waste_short_tiny.name=Kleiner Haufen kurzlebiger Atommüll item.nuclear_waste_short_depleted.name=Zerfallender kurzlebiger Atommüll item.nuclear_waste_short_depleted_tiny.name=Kleiner Haufen zerfallender kurzlebiger Atommüll item.nugget.name=Chicken Nugget +item.nugget_au198.name=Gold-198-Nugget item.nugget_australium.name=Australiumnugget item.nugget_beryllium.name=Berylliumnugget +item.nugget_co60.name=Kobalt-60-Nugget item.nugget_daffergon.name=Daffergonnugget item.nugget_desh.name=Deshnugget item.nugget_dineutronium.name=Dineutroniumnugget @@ -1676,7 +1681,7 @@ item.nugget_mox_fuel.name=MOX-Kernbrennstoffnugget item.nugget_neptunium.name=Neptuniumnugget item.nugget_plutonium.name=Plutoniumnugget item.nugget_plutonium_fuel.name=Plutoniumkernbrennstoffnugget -item.nugget_polonium.name=Poloniumnugget +item.nugget_polonium.name=Polonium-210-Nugget item.nugget_pu_mix.name=Reactorfähiges Plutoniumnugget item.nugget_pu238.name=Pu238-Nugget item.nugget_pu239.name=Pu239-Nugget @@ -1761,9 +1766,9 @@ item.pellet_mercury.name=Quecksilberkugeln item.pellet_mes.name=MES-Watzpellet item.pellet_meteorite.name=Meteoritenkugeln item.pellet_neptunium.name=Neptunium-Watzpellet -item.pellet_rtg.name=Plutonium 238 Pellet -item.pellet_rtg_gold.name=Gold 198 Pellet -item.pellet_rtg_polonium.name=Polonium 210 Pellet +item.pellet_rtg.name=Plutonium-238 Pellet +item.pellet_rtg_gold.name=Gold-198 Pellet +item.pellet_rtg_polonium.name=Polonium-210 Pellet item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet item.pellet_schrabidium.name=Pures Schrabidium-Watzpellet item.photo_panel.name=Photovoltaikpanele @@ -1851,7 +1856,7 @@ item.powder_niobium_tiny.name=Kleiner Haufen Niobstaub item.powder_nitan_mix.name=Nitaniummischung item.powder_plutonium.name=Plutoniumstaub item.powder_poison.name=Giftpulver -item.powder_polonium.name=Poloniumstaub +item.powder_polonium.name=Polonium-210-Staub item.powder_polymer.name=Polymerstaub item.powder_power.name=Energiepulver item.powder_quartz.name=Quarzstaub @@ -1887,6 +1892,21 @@ item.radaway.name=RadAway item.radaway_flush.name=Elite-RadAway item.radaway_strong.name=Starkes RadAway item.radx.name=Rad-X +item.rbmk_fuel_balefire.name=Balefire-RBMK-Kernbrennstoff +item.rbmk_fuel_drx.name=§cDigamma-RBMK-Kernbrennstoff +item.rbmk_fuel_empty.name=Leere RBMK Kernbrennstoffstäbe +item.rbmk_fuel_heaus.name=HEAus-RBMK-Kernbrennstoff +item.rbmk_fuel_hes.name=HES-RBMK-Kernbrennstoff +item.rbmk_fuel_leaus.name=LEAus-RBMK-Kernbrennstoff +item.rbmk_fuel_lep.name=LEP-RBMK-Kernbrennstoff +item.rbmk_fuel_les.name=LES-RBMK-Kernbrennstoff +item.rbmk_fuel_mep.name=MEP-RBMK-Kernbrennstoff +item.rbmk_fuel_mes.name=MES-RBMK-Kernbrennstoff +item.rbmk_fuel_meu.name=MEU-RBMK-Kernbrennstoff +item.rbmk_fuel_mox.name=MOX-RBMK-Kernbrennstoff +item.rbmk_fuel_po210be.name=Po210Be-RBMK-Neutronenquelle +item.rbmk_fuel_pu238be.name=Pu238Be-RBMK-Neutronenquelle +item.rbmk_fuel_thmeu.name=ThMEU-RBMK-Kernbrennstoff item.reactor_core.name=Brutreaktorkern item.reactor_sensor.name=Reaktor-Fernsensor item.record.glass.desc=? ? ? @@ -1918,7 +1938,7 @@ item.rod_dual_neptunium.name=Neptuniumdoppelbrennstab item.rod_dual_plutonium.name=Plutoniumdoppelbrennstab item.rod_dual_plutonium_fuel.name=Doppelte Plutoniumkernbrennstoffzelle item.rod_dual_plutonium_fuel_depleted.name=Erschöpfte Plutoniumdoppelkernbrennstoffzelle -item.rod_dual_polonium.name=Poloniumdoppelbrennstab +item.rod_dual_polonium.name=Polonium-210-Doppelbrennstab item.rod_dual_pu238.name=Pu238-Doppelbrennstab item.rod_dual_pu239.name=Pu239-Doppelbrennstab item.rod_dual_pu240.name=Pu240-Doppelbrennstab @@ -1949,7 +1969,7 @@ item.rod_of_discord.name=Rute der Zwietracht item.rod_plutonium.name=Plutoniumbrennstab item.rod_plutonium_fuel.name=Plutoniumkernbrennstoffzelle item.rod_plutonium_fuel_depleted.name=Erschöpfte Plutoniumkernbrennstoffzelle -item.rod_polonium.name=Poloniumbrennstab +item.rod_polonium.name=Polonium-210-Brennstab item.rod_pu238.name=Pu238-Brennstab item.rod_pu239.name=Pu239-Brennstab item.rod_pu240.name=Pu240-Brennstab @@ -1966,7 +1986,7 @@ item.rod_quad_neptunium.name=Neptuniumvierfachbrennstab item.rod_quad_plutonium.name=Plutoniumvierfachbrennstab item.rod_quad_plutonium_fuel.name=Vierfache Plutoniumkernbrennstoffzelle item.rod_quad_plutonium_fuel_depleted.name=Erschöpfte Plutoniumvierfachkernbrennstoffzelle -item.rod_quad_polonium.name=Poloniumvierfachbrennstab +item.rod_quad_polonium.name=Polonium-210-Vierfachbrennstab item.rod_quad_pu238.name=Pu238-Vierfachbrennstab item.rod_quad_pu239.name=Pu239-Vierfachbrennstab item.rod_quad_pu240.name=Pu240-Vierfachbrennstab @@ -2376,7 +2396,7 @@ tile.block_neptunium.name=Neptuniumblock tile.block_niter.name=Salpeterblock tile.block_plutonium.name=Plutoniumblock tile.block_plutonium_fuel.name=Plutoniumkernbrennstoffblock -tile.block_polonium.name=Poloniumblock +tile.block_polonium.name=Polonium-210-Block tile.block_pu_mix.name=Reaktorfähiger Plutoniumblock tile.block_pu238.name=Pu238-Block tile.block_pu239.name=Pu239-Block diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 9e960f52e..599275d0f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -672,9 +672,12 @@ item.battery_su_l.name=Large SU-Battery item.battery_trixite.name=Off-Brand Spark Battery item.beta.name=Beta Features item.big_sword.name=Great Sword +item.billet_au198.name=Gold-198 Billet +item.billet_australium.name=Australium Billet +item.billet_co60.name=Cobalt-60 Billet item.billet_mox_fuel.name=MOX Fuel Billet item.billet_neptunium.name=Neptunium Billet -item.billet_polonium.name=Polonium Billet +item.billet_polonium.name=Polonium-210 Billet item.billet_pu_mix.name=Reactor Grade Plutonium Billet item.billet_pu238.name=Pu238 Billet item.billet_pu239.name=Pu239 Billet @@ -1350,7 +1353,7 @@ item.ingot_neptunium.name=Neptunium Ingot item.ingot_phosphorus.name=Bar of White Phosphorus item.ingot_plutonium.name=Plutonium Ingot item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel -item.ingot_polonium.name=Polonium Ingot +item.ingot_polonium.name=Polonium-210 Ingot item.ingot_polymer.name=Polymer Bar item.ingot_pu_mix.name=Reactor Grade Plutonium Ingot item.ingot_pu238.name=Pu238 Ingot @@ -1662,8 +1665,10 @@ item.nuclear_waste_short_tiny.name=Tiny Pile of Short-Lived Nuclear Waste item.nuclear_waste_short_depleted.name=Decayed Short-Lived Nuclear Waste item.nuclear_waste_short_depleted_tiny.name=Tiny Pile of Decayed Short-Lived Nuclear Waste item.nugget.name=Chicken Nugget +item.nugget_au198.name=Gold-198 Nugget item.nugget_australium.name=Australium Nugget item.nugget_beryllium.name=Beryllium Nugget +item.nugget_co60.name=Cobalt-60 Nugget item.nugget_daffergon.name=Daffergon Nugget item.nugget_desh.name=Desh Nugget item.nugget_dineutronium.name=Dineutronium Nugget @@ -1676,7 +1681,7 @@ item.nugget_mox_fuel.name=Nugget of MOX Fuel item.nugget_neptunium.name=Neptunium Nugget item.nugget_plutonium.name=Plutonium Nugget item.nugget_plutonium_fuel.name=Nugget of Plutonium Fuel -item.nugget_polonium.name=Polonium Nugget +item.nugget_polonium.name=Polonium-210 Nugget item.nugget_pu_mix.name=Reactor Grade Plutonium Nugget item.nugget_pu238.name=Pu238 Nugget item.nugget_pu239.name=Pu239 Nugget @@ -1761,9 +1766,9 @@ item.pellet_mercury.name=Mercury Rounds item.pellet_mes.name=MES Watz Pellet item.pellet_meteorite.name=Meteorite Rounds item.pellet_neptunium.name=Neptunium Watz Pellet -item.pellet_rtg.name=Plutonium 238 Fuel Pellet -item.pellet_rtg_gold.name=Gold 198 Fuel Pellet -item.pellet_rtg_polonium.name=Polonium 210 Fuel Pellet +item.pellet_rtg.name=Plutonium-238 Fuel Pellet +item.pellet_rtg_gold.name=Gold-198 Fuel Pellet +item.pellet_rtg_polonium.name=Polonium-210 Fuel Pellet item.pellet_rtg_weak.name=Weak Uranium RTG Pellet item.pellet_schrabidium.name=Pure Schrabidium Watz Pellet item.photo_panel.name=Photovoltaic Panel @@ -1851,7 +1856,7 @@ item.powder_niobium_tiny.name=Tiny Pile of Niobium Powder item.powder_nitan_mix.name=Nitanium Blend item.powder_plutonium.name=Plutonium Powder item.powder_poison.name=Poison Powder -item.powder_polonium.name=Polonium Powder +item.powder_polonium.name=Polonium-210 Powder item.powder_polymer.name=Polymer Powder item.powder_power.name=Energy Powder item.powder_quartz.name=Quartz Powder @@ -1887,8 +1892,12 @@ item.radaway.name=RadAway item.radaway_flush.name=Elite RadAway item.radaway_strong.name=Strong RadAway item.radx.name=Rad-X +item.rbmk_fuel_balefire.name=Balefire RBMK Fuel Rod +item.rbmk_fuel_drx.name=§cDigamma RBMK Fuel Rod§r item.rbmk_fuel_empty.name=Empty RBMK Fuel Rod +item.rbmk_fuel_heaus.name=HEAus RBMK Fuel Rod item.rbmk_fuel_hes.name=HES RBMK Fuel Rod +item.rbmk_fuel_leaus.name=LEAus RBMK Fuel Rod item.rbmk_fuel_lep.name=LEP RBMK Fuel Rod item.rbmk_fuel_les.name=LES RBMK Fuel Rod item.rbmk_fuel_mep.name=MEP RBMK Fuel Rod @@ -1929,7 +1938,7 @@ item.rod_dual_neptunium.name=Neptunium Dual Rod item.rod_dual_plutonium.name=Plutonium Dual Rod item.rod_dual_plutonium_fuel.name=Plutonium Dual Fuel Rod item.rod_dual_plutonium_fuel_depleted.name=Depleted Plutonium Dual Fuel Rod -item.rod_dual_polonium.name=Polonium Dual Rod +item.rod_dual_polonium.name=Polonium-210 Dual Rod item.rod_dual_pu238.name=Pu238 Dual Rod item.rod_dual_pu239.name=Pu239 Dual Rod item.rod_dual_pu240.name=Pu240 Dual Rod @@ -1960,7 +1969,7 @@ item.rod_of_discord.name=Rod of Discord item.rod_plutonium.name=Plutonium Rod item.rod_plutonium_fuel.name=Plutonium Fuel Rod item.rod_plutonium_fuel_depleted.name=Depleted Plutonium Fuel Rod -item.rod_polonium.name=Polonium Rod +item.rod_polonium.name=Polonium-210 Rod item.rod_pu238.name=Pu238 Rod item.rod_pu239.name=Pu239 Rod item.rod_pu240.name=Pu240 Rod @@ -1977,7 +1986,7 @@ item.rod_quad_neptunium.name=Neptunium Quad Rod item.rod_quad_plutonium.name=Plutonium Quad Rod item.rod_quad_plutonium_fuel.name=Plutonium Quad Fuel Rod item.rod_quad_plutonium_fuel_depleted.name=Depleted Plutonium Quad Fuel Rod -item.rod_quad_polonium.name=Polonium Quad Rod +item.rod_quad_polonium.name=Polonium-210 Quad Rod item.rod_quad_pu238.name=Pu238 Quad Rod item.rod_quad_pu239.name=Pu239 Quad Rod item.rod_quad_pu240.name=Pu240 Quad Rod @@ -2387,7 +2396,7 @@ tile.block_neptunium.name=Block of Neptunium tile.block_niter.name=Block of Niter tile.block_plutonium.name=Block of Plutonium tile.block_plutonium_fuel.name=Block of Plutonium Fuel -tile.block_polonium.name=Block of Polonium +tile.block_polonium.name=Block of Polonium-210 tile.block_pu_mix.name=Block of Reactor Grade Plutonium tile.block_pu238.name=Block of Pu238 tile.block_pu239.name=Block of Pu239 @@ -2919,4 +2928,4 @@ weapon.ability.chainsaw=Painsaw weapon.ability.radiation=Radioactive Blade weapon.ability.phosphorus=Phosphorus Tip weapon.ability.stun=Stunning -weapon.ability.vampire=Vampire +weapon.ability.vampire=Vampire \ No newline at end of file