Merge branch 'master' of https://github.com/TechReborn/TechReborn
This commit is contained in:
commit
9e4151f5fa
31 changed files with 105 additions and 382 deletions
10
src/main/java/techreborn/api/IpdaItem.java
Normal file
10
src/main/java/techreborn/api/IpdaItem.java
Normal file
|
@ -0,0 +1,10 @@
|
|||
package techreborn.api;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public interface IpdaItem
|
||||
{
|
||||
//TODO
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidCalcium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidCalcium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.calcium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidCalciumCarbonate extends BlockFluidBase{
|
||||
|
||||
public BlockFluidCalciumCarbonate(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.calciumcarbonate");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidChlorite extends BlockFluidBase{
|
||||
|
||||
public BlockFluidChlorite(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.chlorite");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidDeuterium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidDeuterium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.deuterium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidGlyceryl extends BlockFluidBase{
|
||||
|
||||
public BlockFluidGlyceryl(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.glyceryl");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidHelium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidHelium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.helium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidHelium3 extends BlockFluidBase{
|
||||
|
||||
public BlockFluidHelium3(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.helium3");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidHeliumplasma extends BlockFluidBase{
|
||||
|
||||
public BlockFluidHeliumplasma(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.heliumplasma");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidHydrogen extends BlockFluidBase{
|
||||
|
||||
public BlockFluidHydrogen(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.hydrogen");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidLithium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidLithium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.lithium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidMercury extends BlockFluidBase{
|
||||
|
||||
public BlockFluidMercury(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.mercury");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidMethane extends BlockFluidBase{
|
||||
|
||||
public BlockFluidMethane(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.methane");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidNitrocoalfuel extends BlockFluidBase{
|
||||
|
||||
public BlockFluidNitrocoalfuel(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.nitrocoalfuel");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidNitrofuel extends BlockFluidBase{
|
||||
|
||||
public BlockFluidNitrofuel(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.nitrofuel");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidNitrogen extends BlockFluidBase{
|
||||
|
||||
public BlockFluidNitrogen(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.nitrogen");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidNitrogendioxide extends BlockFluidBase{
|
||||
|
||||
public BlockFluidNitrogendioxide(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.nitrogendioxide");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidPotassium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidPotassium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.potassium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidSilicon extends BlockFluidBase{
|
||||
|
||||
public BlockFluidSilicon(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.silicon");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidSodium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidSodium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.sodium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidSodiumpersulfate extends BlockFluidBase{
|
||||
|
||||
public BlockFluidSodiumpersulfate(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.sodiumpersulfate");
|
||||
}
|
||||
|
||||
}
|
|
@ -3,12 +3,12 @@ package techreborn.blocks.fluid;
|
|||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidBerylium extends BlockFluidBase{
|
||||
public class BlockFluidTechReborn extends BlockFluidBase{
|
||||
|
||||
public BlockFluidBerylium(Fluid fluid, Material material)
|
||||
public BlockFluidTechReborn(Fluid fluid, Material material, String name)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.berylium");
|
||||
setBlockName(name);
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidTritium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidTritium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.tritium");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class BlockFluidWolframium extends BlockFluidBase{
|
||||
|
||||
public BlockFluidWolframium(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
setBlockName("techreborn.wolframium");
|
||||
}
|
||||
|
||||
}
|
|
@ -51,22 +51,8 @@ public class BlockBlastFurnace extends BlockMachineBase {
|
|||
EntityPlayer player, int side, float hitX, float hitY, float hitZ)
|
||||
{
|
||||
if (!player.isSneaking())
|
||||
for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
if (world.getTileEntity(x + direction.offsetX, y
|
||||
+ direction.offsetY, z + direction.offsetZ) instanceof TileMachineCasing)
|
||||
{
|
||||
TileMachineCasing casing = (TileMachineCasing) world
|
||||
.getTileEntity(x + direction.offsetX, y
|
||||
+ direction.offsetY, z + direction.offsetZ);
|
||||
if (casing.getMultiblockController() != null
|
||||
&& casing.getMultiblockController().isAssembled() && !casing.getMultiblockController().isStar)
|
||||
{
|
||||
player.openGui(Core.INSTANCE,
|
||||
GuiHandler.blastFurnaceID, world, x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
player.openGui(Core.INSTANCE, GuiHandler.blastFurnaceID, world, x, y,
|
||||
z);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -248,7 +248,7 @@ public class GuiHandler implements IGuiHandler {
|
|||
(TileChemicalReactor) world.getTileEntity(x, y, z));
|
||||
} else if (ID == pdaID)
|
||||
{
|
||||
return new GuiPda(player);
|
||||
return new GuiPda(player, new ContainerPda(player));
|
||||
} else if (ID == destructoPackID) {
|
||||
return new GuiDestructoPack(new ContainerDestructoPack(player));
|
||||
} else if (ID == lesuID) {
|
||||
|
|
23
src/main/java/techreborn/client/container/ContainerPda.java
Normal file
23
src/main/java/techreborn/client/container/ContainerPda.java
Normal file
|
@ -0,0 +1,23 @@
|
|||
package techreborn.client.container;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import techreborn.api.recipe.RecipeCrafter;
|
||||
import techreborn.client.SlotOutput;
|
||||
import techreborn.tiles.TileAlloySmelter;
|
||||
|
||||
public class ContainerPda extends TechRebornContainer {
|
||||
|
||||
EntityPlayer player;
|
||||
public ContainerPda(EntityPlayer player)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
|
@ -118,11 +118,11 @@ public class ChargeHud
|
|||
{
|
||||
if (euValue > 1000000) {
|
||||
double tenX = Math.round(euValue / 100000);
|
||||
return Double.toString(tenX / 10.0).concat(" m EU");
|
||||
return Double.toString(tenX / 10.0).concat("M ");
|
||||
}
|
||||
else if (euValue > 1000) {
|
||||
double tenX = Math.round(euValue / 100);
|
||||
return Double.toString(tenX / 10.0).concat(" k EU");
|
||||
return Double.toString(tenX / 10.0).concat("k ");
|
||||
}
|
||||
else {
|
||||
return Double.toString(Math.floor(euValue)).concat(" EU");
|
||||
|
|
|
@ -4,29 +4,7 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import techreborn.blocks.fluid.BlockFluidBerylium;
|
||||
import techreborn.blocks.fluid.BlockFluidCalcium;
|
||||
import techreborn.blocks.fluid.BlockFluidCalciumCarbonate;
|
||||
import techreborn.blocks.fluid.BlockFluidChlorite;
|
||||
import techreborn.blocks.fluid.BlockFluidDeuterium;
|
||||
import techreborn.blocks.fluid.BlockFluidGlyceryl;
|
||||
import techreborn.blocks.fluid.BlockFluidHelium;
|
||||
import techreborn.blocks.fluid.BlockFluidHelium3;
|
||||
import techreborn.blocks.fluid.BlockFluidHeliumplasma;
|
||||
import techreborn.blocks.fluid.BlockFluidHydrogen;
|
||||
import techreborn.blocks.fluid.BlockFluidLithium;
|
||||
import techreborn.blocks.fluid.BlockFluidMercury;
|
||||
import techreborn.blocks.fluid.BlockFluidMethane;
|
||||
import techreborn.blocks.fluid.BlockFluidNitrocoalfuel;
|
||||
import techreborn.blocks.fluid.BlockFluidNitrofuel;
|
||||
import techreborn.blocks.fluid.BlockFluidNitrogen;
|
||||
import techreborn.blocks.fluid.BlockFluidNitrogendioxide;
|
||||
import techreborn.blocks.fluid.BlockFluidPotassium;
|
||||
import techreborn.blocks.fluid.BlockFluidSilicon;
|
||||
import techreborn.blocks.fluid.BlockFluidSodium;
|
||||
import techreborn.blocks.fluid.BlockFluidSodiumpersulfate;
|
||||
import techreborn.blocks.fluid.BlockFluidTritium;
|
||||
import techreborn.blocks.fluid.BlockFluidWolframium;
|
||||
import techreborn.blocks.fluid.BlockFluidTechReborn;
|
||||
import techreborn.lib.ModInfo;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
|
@ -104,117 +82,117 @@ public class ModFluids {
|
|||
public static void init()
|
||||
{
|
||||
FluidRegistry.registerFluid(fluidberylium);
|
||||
BlockFluidBerylium = new BlockFluidBerylium(fluidberylium, Material.water);
|
||||
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.water, "techreborn.berylium");
|
||||
GameRegistry.registerBlock(BlockFluidBerylium, ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
|
||||
fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalcium);
|
||||
BlockFluidCalcium = new BlockFluidCalcium(fluidcalcium, Material.water);
|
||||
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.water, "techreborn.calcium");
|
||||
GameRegistry.registerBlock(BlockFluidCalcium, ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
|
||||
fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalciumcarbonate);
|
||||
BlockFluidCalciumCarbonate = new BlockFluidCalciumCarbonate(fluidcalciumcarbonate, Material.water);
|
||||
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.water, "techreborn.calciumcarbonate");
|
||||
GameRegistry.registerBlock(BlockFluidCalciumCarbonate, ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
|
||||
fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidChlorite);
|
||||
BlockFluidChlorite = new BlockFluidChlorite(fluidChlorite, Material.water);
|
||||
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.water, "techreborn.chlorite");
|
||||
GameRegistry.registerBlock(BlockFluidChlorite, ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
|
||||
fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidDeuterium);
|
||||
BlockFluidDeuterium = new BlockFluidDeuterium(fluidDeuterium, Material.water);
|
||||
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.water, "techreborn.deuterium");
|
||||
GameRegistry.registerBlock(BlockFluidDeuterium, ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
|
||||
fluidDeuterium.setUnlocalizedName(BlockFluidDeuterium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidGlyceryl);
|
||||
BlockFluidGlyceryl = new BlockFluidGlyceryl(fluidGlyceryl, Material.water);
|
||||
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.water, "techreborn.glyceryl");
|
||||
GameRegistry.registerBlock(BlockFluidGlyceryl, ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
|
||||
fluidGlyceryl.setUnlocalizedName(BlockFluidGlyceryl.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium);
|
||||
BlockFluidHelium = new BlockFluidHelium(fluidHelium, Material.water);
|
||||
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.water, "techreborn.helium");
|
||||
GameRegistry.registerBlock(BlockFluidHelium, ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
|
||||
fluidHelium.setUnlocalizedName(BlockFluidHelium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium3);
|
||||
BlockFluidHelium3 = new BlockFluidHelium3(fluidHelium3, Material.water);
|
||||
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.water, "techreborn.helium3");
|
||||
GameRegistry.registerBlock(BlockFluidHelium3, ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
|
||||
fluidHelium3.setUnlocalizedName(BlockFluidHelium3.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidHeliumplasma);
|
||||
BlockFluidHeliumplasma = new BlockFluidHeliumplasma(fluidHeliumplasma, Material.water);
|
||||
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.water, "techreborn.heliumplasma");
|
||||
GameRegistry.registerBlock(BlockFluidHeliumplasma, ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
|
||||
fluidHeliumplasma.setUnlocalizedName(fluidHeliumplasma.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidHydrogen);
|
||||
BlockFluidHydrogen = new BlockFluidHydrogen(fluidHydrogen, Material.water);
|
||||
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.water, "techreborn.hydrogen");
|
||||
GameRegistry.registerBlock(BlockFluidHydrogen, ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
|
||||
fluidHydrogen.setUnlocalizedName(fluidHydrogen.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidLithium);
|
||||
BlockFluidLithium = new BlockFluidLithium(fluidLithium, Material.water);
|
||||
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.water, "techreborn.lithium");
|
||||
GameRegistry.registerBlock(BlockFluidLithium, ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
|
||||
fluidLithium.setUnlocalizedName(fluidLithium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidMercury);
|
||||
BlockFluidMercury = new BlockFluidMercury(fluidMercury, Material.water);
|
||||
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.water, "techreborn.mercury");
|
||||
GameRegistry.registerBlock(BlockFluidMercury, ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
|
||||
fluidMercury.setUnlocalizedName(fluidMercury.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidMethane);
|
||||
BlockFluidMethane = new BlockFluidMethane(fluidMethane, Material.water);
|
||||
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.water, "techreborn.methane");
|
||||
GameRegistry.registerBlock(BlockFluidMethane, ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
|
||||
fluidMethane.setUnlocalizedName(fluidMethane.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrocoalfuel);
|
||||
BlockFluidNitrocoalfuel = new BlockFluidNitrocoalfuel(fluidNitrocoalfuel, Material.water);
|
||||
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.water, "techreborn.nitrocoalfuel");
|
||||
GameRegistry.registerBlock(BlockFluidNitrocoalfuel, ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
|
||||
fluidNitrocoalfuel.setUnlocalizedName(fluidNitrocoalfuel.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrofuel);
|
||||
BlockFluidNitrofuel = new BlockFluidNitrofuel(fluidNitrofuel, Material.water);
|
||||
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.water, "techreborn.nitrofuel");
|
||||
GameRegistry.registerBlock(BlockFluidNitrofuel, ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
|
||||
fluidNitrofuel.setUnlocalizedName(fluidNitrofuel.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogen);
|
||||
BlockFluidNitrogen = new BlockFluidNitrogen(fluidNitrogen, Material.water);
|
||||
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.water, "techreborn.nitrogen");
|
||||
GameRegistry.registerBlock(BlockFluidNitrogen, ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
|
||||
fluidNitrogen.setUnlocalizedName(fluidNitrogen.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogendioxide);
|
||||
BlockFluidNitrogendioxide = new BlockFluidNitrogendioxide(fluidNitrogendioxide, Material.water);
|
||||
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.water, "techreborn.nitrogendioxide");
|
||||
GameRegistry.registerBlock(BlockFluidNitrogendioxide, ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
|
||||
fluidNitrogendioxide.setUnlocalizedName(fluidNitrogendioxide.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidPotassium);
|
||||
BlockFluidPotassium = new BlockFluidPotassium(fluidPotassium, Material.water);
|
||||
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.water, "techreborn.potassium");
|
||||
GameRegistry.registerBlock(BlockFluidPotassium, ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
|
||||
fluidPotassium.setUnlocalizedName(fluidPotassium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidSilicon);
|
||||
BlockFluidSilicon = new BlockFluidSilicon(fluidSilicon, Material.water);
|
||||
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.water, "techreborn.silicon");
|
||||
GameRegistry.registerBlock(BlockFluidSilicon, ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
|
||||
fluidSilicon.setUnlocalizedName(fluidSilicon.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodium);
|
||||
BlockFluidSodium = new BlockFluidSodium(fluidSodium, Material.water);
|
||||
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.water, "techreborn.sodium");
|
||||
GameRegistry.registerBlock(BlockFluidSodium, ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
|
||||
fluidSodium.setUnlocalizedName(fluidSodium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodiumpersulfate);
|
||||
BlockFluidSodiumpersulfate = new BlockFluidSodiumpersulfate(fluidSodiumpersulfate, Material.water);
|
||||
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.water, "techreborn.sodiumpersulfate");
|
||||
GameRegistry.registerBlock(BlockFluidSodiumpersulfate, ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
|
||||
fluidSodiumpersulfate.setUnlocalizedName(fluidSodiumpersulfate.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidTritium);
|
||||
BlockFluidTritium = new BlockFluidTritium(fluidTritium, Material.water);
|
||||
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.water, "techreborn.tritium");
|
||||
GameRegistry.registerBlock(BlockFluidTritium, ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
|
||||
fluidTritium.setUnlocalizedName(fluidTritium.getUnlocalizedName());
|
||||
|
||||
FluidRegistry.registerFluid(fluidWolframium);
|
||||
BlockFluidWolframium = new BlockFluidWolframium(fluidWolframium, Material.water);
|
||||
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.water, "techreborn.wolframium");
|
||||
GameRegistry.registerBlock(BlockFluidWolframium, ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
|
||||
fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName());
|
||||
|
||||
|
|
|
@ -1,20 +1,27 @@
|
|||
package techreborn.pda;
|
||||
|
||||
import java.awt.Container;
|
||||
|
||||
import techreborn.client.container.ContainerPda;
|
||||
import techreborn.cofhLib.gui.GuiBase;
|
||||
import techreborn.cofhLib.gui.GuiColor;
|
||||
import techreborn.cofhLib.gui.element.ElementSlider;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class GuiPda extends GuiScreen {
|
||||
public class GuiPda extends GuiBase {
|
||||
|
||||
public final int guiHeight = 256;
|
||||
public final int guiWidth = 256;
|
||||
public final int guiHeight = 180;
|
||||
private int guiLeft, guiTop;
|
||||
private ElementSlider slider;
|
||||
|
||||
private static final ResourceLocation pdaGuipages = new ResourceLocation(
|
||||
"techreborn:" + "textures/gui/pda.png");
|
||||
private static final ResourceLocation pdaGuipages = new ResourceLocation("techreborn:" + "textures/gui/pda.png");
|
||||
|
||||
public GuiPda(EntityPlayer player)
|
||||
public GuiPda(EntityPlayer player, ContainerPda container)
|
||||
{
|
||||
super(container);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -23,6 +30,27 @@ public class GuiPda extends GuiScreen {
|
|||
super.initGui();
|
||||
this.guiLeft = this.width / 2 - this.guiWidth / 2;
|
||||
this.guiTop = this.height / 2 - this.guiHeight / 2;
|
||||
//TODO fix
|
||||
slider = new ElementSlider(this, "scrollBar", 239, 36, 12, 201, 187, 0)
|
||||
{
|
||||
@Override
|
||||
protected void dragSlider(int x, int y)
|
||||
{
|
||||
if (y > _value)
|
||||
{
|
||||
setValue(_value + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
setValue(_value - 1);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
slider.backgroundColor = new GuiColor(0, 0, 0, 0).getColor();
|
||||
slider.borderColor = new GuiColor(0, 0, 0, 0).getColor();
|
||||
slider.setSliderSize(12, 15);
|
||||
addElement(slider);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -30,7 +58,13 @@ public class GuiPda extends GuiScreen {
|
|||
{
|
||||
mc.getTextureManager().bindTexture(pdaGuipages);
|
||||
drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth,this.guiHeight);
|
||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||
// super.drawScreen(mouseX, mouseY, partialTicks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesGuiPauseGame()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.1 KiB |
Loading…
Reference in a new issue