Skip to content

Commit

Permalink
HUGE COMMIT OF EPIC GLORY
Browse files Browse the repository at this point in the history 
NEW VERSION VERY SOON

Closes Issue #19 - Fixed the bucket exchange in the Gui
Closes Issue #10 - Backpacks will place on death up to 12 blocks away and 7 blocks below or above the point where you die.
New GUI. Crafting GUI deprecated, a crafting matrix is now located in the regular GUI.
MOAR SLOTS.

Remade the whole backpack model.
Remade all the textures to fit the new model and make a 500% increase in awesomeness. New skins for old backpacks.
Some backpacks now have extra odds and ends...
Added 9 new backpacks. They're all in creative mode only for the moment.
Fixed many derps.
Cleaned a bunch of code.
Optimizations everywhere!
Optimized the GUI calculations.
No more shading when using NEI.
GUI now updates when the player inventory changes.
I might have broken the cow.
Fixed a bunch of localizations - Dear translators, please uptade the translations if you can.
Added Extended compatibility for Tinker's Construct and Thermal Expansion.
Added more tools to the tool slots: Flint&Steel, Shears, FishingRod
Made the GUI a lot smarter.
Fixed the cow again for the millionth time.
You can't do a Backpackception anymore (putting a backpack inside of itself, or a backpack in a backack). Hopefully.
Fixed several visual glitches.
Commented a bunch of code.
  • Loading branch information
@Darkona
Darkona committed Dec 22, 2014
1 parent 956f395 commit ba6fd8e
Show file tree
Hide file tree
Showing 183 changed files with 1,440 additions and 950 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.7.10-0.6.6d"
version = "1.7.10-0.7.0"
group = "com.darkona.adventurebackpack" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "adventurebackpack"

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/darkona/adventurebackpack/CreativeTabAB.java
View file
Expand Up @@ -19,6 +19,17 @@ public Item getTabIconItem()
return ModItems.machete;
}

@Override
public String getTranslatedTabLabel()
{
return super.getTranslatedTabLabel();
}

@Override
public String getTabLabel()
{
return ModInfo.MOD_ID.toLowerCase();
}

};

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/darkona/adventurebackpack/block/BlockAdventureBackpack.java
View file
Expand Up @@ -126,7 +126,7 @@ private String getAssociatedTileColorName(IBlockAccess world, int x, int y, int
@Override
public boolean canRenderInPass(int pass)
{
return pass == 1 || pass == 2;
return true;
}

@Override
Expand All @@ -138,7 +138,7 @@ public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity
@Override
public float getEnchantPowerBonus(World world, int x, int y, int z)
{
return getAssociatedTileColorName(world, x, y, z).equals("Bookshelf") ? 20 : 0;
return getAssociatedTileColorName(world, x, y, z).equals("Bookshelf") ? 10 : 0;
}

@Override
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/darkona/adventurebackpack/block/TileAdventureBackpack.java
View file
Expand Up @@ -303,6 +303,7 @@ public void loadFromNBT(NBTTagCompound compound)
byte slot = item.getByte("Slot");
if (slot >= 0 && slot < inventory.length)
{

inventory[slot] = ItemStack.loadItemStackFromNBT(item);
}
}
Expand Down
108 changes: 61 additions & 47 deletions src/main/java/com/darkona/adventurebackpack/client/gui/GuiAdvBackpack.java
View file
Expand Up @@ -7,8 +7,6 @@
import com.darkona.adventurebackpack.init.ModNetwork;
import com.darkona.adventurebackpack.inventory.BackpackContainer;
import com.darkona.adventurebackpack.inventory.InventoryItem;
import com.darkona.adventurebackpack.network.GuiBackpackMessage;
import com.darkona.adventurebackpack.network.MessageConstants;
import com.darkona.adventurebackpack.network.SleepingBagMessage;
import com.darkona.adventurebackpack.util.Resources;
import cpw.mods.fml.relauncher.Side;
Expand All @@ -20,7 +18,9 @@
import org.lwjgl.opengl.GL11;

/**
* Created by Darkona on 12/10/2014.
* Created on 12/10/2014
* @author Darkona
*
*/
@SideOnly(Side.CLIENT)
public class GuiAdvBackpack extends GuiContainer implements IBackpackGui
Expand All @@ -33,11 +33,10 @@ public class GuiAdvBackpack extends GuiContainer implements IBackpackGui
protected int Y;
protected int Z;
private EntityPlayer player;
private static final ResourceLocation texture = Resources.guiTextures("guiBackpack");
private static GuiImageButtonNormal bedButton = new GuiImageButtonNormal(153, 6, 18, 18);
private static GuiImageButtonNormal craftButton = new GuiImageButtonNormal(5, 6, 18, 18);
private static GuiTank tankLeft = new GuiTank(25, 7, 64, 16, GeneralConfig.GUI_TANK_RES);
private static GuiTank tankRight = new GuiTank(135, 7, 64, 16, GeneralConfig.GUI_TANK_RES);
private static final ResourceLocation texture = Resources.guiTextures("guiBackpackNew");
private static GuiImageButtonNormal bedButton = new GuiImageButtonNormal(5, 91, 18, 18);
private static GuiTank tankLeft = new GuiTank(25, 7, 100, 16, GeneralConfig.GUI_TANK_RES);
private static GuiTank tankRight = new GuiTank(207, 7, 100, 16, GeneralConfig.GUI_TANK_RES);
private FluidStack lft;
private FluidStack rgt;
public int lefties;
Expand All @@ -46,11 +45,11 @@ public class GuiAdvBackpack extends GuiContainer implements IBackpackGui

public GuiAdvBackpack(EntityPlayer player, TileAdventureBackpack tileBackpack)
{
super(new BackpackContainer(player.inventory, tileBackpack, BackpackContainer.SOURCE_TILE));
super(new BackpackContainer(player, tileBackpack, BackpackContainer.SOURCE_TILE));
this.inventory = tileBackpack;
this.source = true;
xSize = 176;
ySize = 166;
xSize = 248;
ySize = 207;
this.X = tileBackpack.xCoord;
this.Y = tileBackpack.yCoord;
this.Z = tileBackpack.zCoord;
Expand All @@ -61,12 +60,12 @@ public GuiAdvBackpack(EntityPlayer player, TileAdventureBackpack tileBackpack)

public GuiAdvBackpack(EntityPlayer player, InventoryItem item, boolean wearing)
{
super(new BackpackContainer(player.inventory, item, BackpackContainer.SOURCE_ITEM));
super(new BackpackContainer(player, item, BackpackContainer.SOURCE_ITEM));
this.inventory = item;
this.wearing = wearing;
this.source = false;
xSize = 176;
ySize = 166;
xSize = 248;
ySize = 207;
this.player = player;
this.lefties = guiLeft;
this.topsies = guiTop;
Expand All @@ -92,58 +91,87 @@ protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY)
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);

// Buttons and button highlight
int srcX = 177;
int srcY = 20;
int srcX = 1;
int srcY = 227;
if (source)
{
if (bedButton.inButton(this, mouseX, mouseY))
{
bedButton.draw(this, srcX + 19, srcY + 19);
bedButton.draw(this, srcX + 19, srcY);

} else
{
bedButton.draw(this, srcX, srcY + 19);
bedButton.draw(this, srcX, srcY);
}
}

if (craftButton.inButton(this, mouseX, mouseY))
{
craftButton.draw(this, srcX + 19, srcY);
} else
inventory.openInventory();
lft = inventory.getLeftTank().getFluid();
rgt = inventory.getRightTank().getFluid();



/* zLevel +=1;
if (tankLeft.inTank(this, mouseX, mouseY))
{
craftButton.draw(this, srcX, srcY);
drawHoveringText(tankLeft.getTankTooltip(), mouseX, mouseY, fontRendererObj);
}
if (tankRight.inTank(this, mouseX, mouseY))
{
drawHoveringText(tankRight.getTankTooltip(), mouseX, mouseY, fontRendererObj);
}*/
}

@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{

GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_BLEND);
inventory.openInventory();
lft = inventory.getLeftTank().getFluid();
rgt = inventory.getRightTank().getFluid();

tankLeft.draw(this, lft);
tankRight.draw(this, rgt);

/*
if (tankLeft.inTank(this, mouseX, mouseY))
{
GL11.glPushMatrix();
drawHoveringText(tankLeft.getTankTooltip(), mouseX - guiLeft, mouseY - guiTop, fontRendererObj);
GL11.glPopMatrix();
}
if (tankRight.inTank(this, mouseX, mouseY))
{
drawHoveringText(tankRight.getTankTooltip(), mouseX - guiLeft, mouseY - guiTop, fontRendererObj);
}
*/

GL11.glPushMatrix();
//GL11.glTranslatef(8f,64f,0f);
GL11.glScalef(0.6f, 0.6f, 0.6f);
String name = (lft != null) ? lft.getLocalizedName() : "None";
String amount = (lft != null ? lft.amount : "Empty").toString();
String capacity = Integer.toString(inventory.getLeftTank().getCapacity());
int offsetY = 32;
int offsetX = 8;
fontRendererObj.drawString(getFirstWord(name), 1 + offsetX , 64 + offsetY,0x373737 ,false);
fontRendererObj.drawString(amount, 1 + offsetX, 79 + offsetY, 0x373737,false);
fontRendererObj.drawString(capacity , 1 + offsetX, 94 + offsetY, 0x373737,false);

name = (rgt != null) ? rgt.getLocalizedName() : "None";
amount = (rgt != null ? rgt.amount : "Empty").toString();
fontRendererObj.drawString(getFirstWord(name), 369 + offsetX , 64 + offsetY, 0x373737,false);
fontRendererObj.drawString(amount, 369 + offsetX, 79 + offsetY, 0x373737,false);
fontRendererObj.drawString(capacity, 369 + offsetX, 94 + offsetY, 0x373737,false);

GL11.glPopMatrix();
}

/*GL11.glPushMatrix();
GL11.glScalef(0.8f, 0.8f, 0.8f);
String name = "Adventure Backpack";
fontRendererObj.drawString(name, ((xSize - fontRendererObj.getStringWidth(name)) / 2), 4, 0x404040);
GL11.glPopMatrix();*/
private String getFirstWord(String text) {
if (text.indexOf(' ') > -1) { // Check if there is more than one word.
return text.substring(0, text.indexOf(' ')); // Extract first word.
} else {
return text; // Text is the first word itself.
}
}

@Override
Expand Down Expand Up @@ -178,20 +206,6 @@ protected void mouseClicked(int mouseX, int mouseY, int button)
{
TileAdventureBackpack te = (TileAdventureBackpack) inventory;
ModNetwork.networkWrapper.sendToServer(new SleepingBagMessage(te.xCoord, te.yCoord, te.zCoord));
} else if (craftButton.inButton(this, mouseX, mouseY))
{
if (source)
{
ModNetwork.networkWrapper
.sendToServer(new GuiBackpackMessage(MessageConstants.CRAFT_GUI,
MessageConstants.FROM_TILE));
} else
{
ModNetwork.networkWrapper
.sendToServer(new GuiBackpackMessage(MessageConstants.CRAFT_GUI,
wearing ? MessageConstants.FROM_KEYBIND : MessageConstants.FROM_HOLDING));
}

}
super.mouseClicked(mouseX, mouseY, button);
}
Expand Down

0 comments on commit ba6fd8e

Please sign in to comment.