New achievements
Renamed Manuel to PDA
Moved PDA class's to PDA package
This commit is contained in:
Gig 2015-04-18 21:24:49 +01:00
parent 787df47cfa
commit 1a68b5c7c6
10 changed files with 38 additions and 24 deletions

View file

@ -14,10 +14,14 @@ public class TRAchievements {
public static int pageIndex; public static int pageIndex;
public static Achievement orePickUp; public static Achievement orePickUp;
public static Achievement thermalgenCraft;
public static Achievement centrifugeCraft;
public static void init() public static void init()
{ {
orePickUp = new AchievementMod(AchievementNames.ORE_PICKUP, 0, 0, new ItemStack(ModBlocks.ore,1, 0), null); orePickUp = new AchievementMod(AchievementNames.ORE_PICKUP, 0, 0, new ItemStack(ModBlocks.ore,1, 0), null);
centrifugeCraft = new AchievementMod(AchievementNames.CENTRIFUGE_CRAFT, 1, 1, new ItemStack(ModBlocks.centrifuge), orePickUp);
thermalgenCraft = new AchievementMod("thermalgen_craft", 2, 1, new ItemStack(ModBlocks.thermalGenerator), null);
pageIndex = AchievementPage.getAchievementPages().size(); pageIndex = AchievementPage.getAchievementPages().size();
techrebornPage = new AchievementPage(ModInfo.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); techrebornPage = new AchievementPage(ModInfo.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()]));

View file

@ -5,9 +5,12 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import techreborn.Core; import techreborn.Core;
@ -50,6 +53,7 @@ public class BlockBlastFurnace extends BlockContainer{
return true; return true;
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) { public void registerBlockIcons(IIconRegister icon) {
@ -60,7 +64,7 @@ public class BlockBlastFurnace extends BlockContainer{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int currentSide, int meta) { public IIcon getIcon(int currentSide, int meta) {
if (currentSide == 2) { if (currentSide == 3) {
return front; return front;
} else { } else {
return other; return other;

View file

@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.client.container.*; import techreborn.client.container.*;
import techreborn.client.gui.*; import techreborn.client.gui.*;
import techreborn.pda.GuiPda;
import techreborn.tiles.*; import techreborn.tiles.*;
public class GuiHandler implements IGuiHandler { public class GuiHandler implements IGuiHandler {
@ -16,7 +17,7 @@ public class GuiHandler implements IGuiHandler {
public static final int centrifugeID = 3; public static final int centrifugeID = 3;
public static final int rollingMachineID = 4; public static final int rollingMachineID = 4;
public static final int blastFurnaceID = 5; public static final int blastFurnaceID = 5;
public static final int manuelID = 6; public static final int pdaID = 6;
@Override @Override
@ -33,7 +34,7 @@ public class GuiHandler implements IGuiHandler {
return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(x, y, z), player); return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(x, y, z), player);
} else if (ID == blastFurnaceID) { } else if (ID == blastFurnaceID) {
return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(x, y, z), player); return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(x, y, z), player);
} else if (ID == manuelID) { } else if (ID == pdaID) {
return null; return null;
} }
@ -54,8 +55,8 @@ public class GuiHandler implements IGuiHandler {
return new GuiRollingMachine(player, (TileRollingMachine) world.getTileEntity(x, y, z)); return new GuiRollingMachine(player, (TileRollingMachine) world.getTileEntity(x, y, z));
} else if (ID == blastFurnaceID) { } else if (ID == blastFurnaceID) {
return new GuiBlastFurnace(player, (TileBlastFurnace) world.getTileEntity(x, y, z)); return new GuiBlastFurnace(player, (TileBlastFurnace) world.getTileEntity(x, y, z));
} else if (ID == manuelID) { } else if (ID == pdaID) {
return new GuiManuel(player); return new GuiPda(player);
} }
return null; return null;
} }

View file

@ -12,13 +12,13 @@ import techreborn.items.ItemDustsSmall;
import techreborn.items.ItemGems; import techreborn.items.ItemGems;
import techreborn.items.ItemIngots; import techreborn.items.ItemIngots;
import techreborn.items.ItemParts; import techreborn.items.ItemParts;
import techreborn.items.ItemTechManuel;
import techreborn.items.armor.ItemGravityChest; import techreborn.items.armor.ItemGravityChest;
import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.armor.ItemLithiumBatpack;
import techreborn.items.tools.ItemAdvancedDrill; import techreborn.items.tools.ItemAdvancedDrill;
import techreborn.items.tools.ItemOmniTool; import techreborn.items.tools.ItemOmniTool;
import techreborn.items.tools.ItemRockCutter; import techreborn.items.tools.ItemRockCutter;
import techreborn.items.tools.ItemTechPda;
import techreborn.util.LogHelper; import techreborn.util.LogHelper;
public class ModItems { public class ModItems {
@ -62,7 +62,7 @@ public class ModItems {
GameRegistry.registerItem(advancedDrill, "advancedDrill"); GameRegistry.registerItem(advancedDrill, "advancedDrill");
gravityChest = new ItemGravityChest(ArmorMaterial.DIAMOND, 7, 1); gravityChest = new ItemGravityChest(ArmorMaterial.DIAMOND, 7, 1);
GameRegistry.registerItem(gravityChest, "gravitychestplate"); GameRegistry.registerItem(gravityChest, "gravitychestplate");
manuel = new ItemTechManuel(); manuel = new ItemTechPda();
GameRegistry.registerItem(manuel, "techmanuel"); GameRegistry.registerItem(manuel, "techmanuel");
LogHelper.info("TechReborns Items Loaded"); LogHelper.info("TechReborns Items Loaded");

View file

@ -1,4 +1,4 @@
package techreborn.items; package techreborn.items.tools;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -9,25 +9,25 @@ import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class ItemTechManuel extends Item{ public class ItemTechPda extends Item{
public ItemTechManuel() public ItemTechPda()
{ {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.manuel"); setUnlocalizedName("techreborn.pda");
setMaxStackSize(1); setMaxStackSize(1);
} }
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister)
{ {
itemIcon = iconRegister.registerIcon("techreborn:" + "tool/manuel"); itemIcon = iconRegister.registerIcon("techreborn:" + "tool/pda");
} }
@Override @Override
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player)
{ {
player.openGui(Core.INSTANCE, GuiHandler.manuelID, world, (int)player.posX, (int)player.posY, (int)player.posY); player.openGui(Core.INSTANCE, GuiHandler.pdaID, world, (int)player.posX, (int)player.posY, (int)player.posY);
return itemStack; return itemStack;
} }

View file

@ -3,5 +3,5 @@ package techreborn.lib;
public class AchievementNames public class AchievementNames
{ {
public static final String ORE_PICKUP = "orePickup"; public static final String ORE_PICKUP = "orePickup";
public static final String CENTRIFUGE_CRAFT = "centrifugeCraft";
} }

View file

@ -1,18 +1,18 @@
package techreborn.client.gui; package techreborn.pda;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public class GuiManuel extends GuiScreen{ public class GuiPda extends GuiScreen{
public final int guiWidth = 256; public final int guiWidth = 256;
public final int guiHeight = 180; public final int guiHeight = 180;
private int guiLeft, guiTop; private int guiLeft, guiTop;
private static final ResourceLocation tomeGuipages = new ResourceLocation("techreborn:" + "textures/gui/manuel.png"); private static final ResourceLocation pdaGuipages = new ResourceLocation("techreborn:" + "textures/gui/pda.png");
public GuiManuel(EntityPlayer player) {} public GuiPda(EntityPlayer player) {}
@Override @Override
public void initGui() public void initGui()
@ -25,8 +25,9 @@ public class GuiManuel extends GuiScreen{
public void drawScreen(int mouseX, int mouseY, float partialTicks) public void drawScreen(int mouseX, int mouseY, float partialTicks)
{ {
// this.fontRendererObj.setUnicodeFlag(true); // this.fontRendererObj.setUnicodeFlag(true);
this.mc.getTextureManager().bindTexture(tomeGuipages); this.mc.getTextureManager().bindTexture(pdaGuipages);
this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth, this.guiHeight); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth, this.guiHeight);
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
} }

View file

@ -1,17 +1,20 @@
package techreborn.tiles; package techreborn.tiles;
import cpw.mods.fml.relauncher.Side; import java.util.List;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager; import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import techreborn.init.ModBlocks;
import techreborn.packets.PacketHandler; import techreborn.packets.PacketHandler;
import cpw.mods.fml.relauncher.Side;
import java.util.List; import cpw.mods.fml.relauncher.SideOnly;
public class TileMachineBase extends TileEntity { public class TileMachineBase extends TileEntity {
private int facing;
@Override @Override
public void updateEntity() { public void updateEntity() {
@ -42,4 +45,5 @@ public class TileMachineBase extends TileEntity {
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
readFromNBT(packet.func_148857_g()); readFromNBT(packet.func_148857_g());
} }
} }

View file

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

Before

Width:  |  Height:  |  Size: 294 B

After

Width:  |  Height:  |  Size: 294 B