Skip to content

[1.10] GuiTabs for survival inventory, patch to solve inventory tab conflicts and reduce keybind usage. #3349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
+487 −13
Closed

[1.10] GuiTabs for survival inventory, patch to solve inventory tab conflicts and reduce keybind usage. #3349

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35352b8
Intended to solve conflicts between mods that add inventories for the…
AbsolemJackdaw Nov 1, 2016
b036c5a
fixed resource location not being drawn correctly.
AbsolemJackdaw Nov 2, 2016
7199549
added licence headers.
AbsolemJackdaw Nov 2, 2016
b7e5a9f
added more header
AbsolemJackdaw Nov 2, 2016
df1081e
removed redundant id's for tabs.
AbsolemJackdaw Nov 3, 2016
30ac98a
cached container.getClass(), is now a field.
AbsolemJackdaw Nov 4, 2016
b2207bc
moved registry out of the constructor for a better range of registry.
AbsolemJackdaw Nov 9, 2016
8f9bbf7
list of gui tabs does not quiry by class anymore, but by a getter fro…
AbsolemJackdaw Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added licence headers. 
removed fully qualified name.

removed author tags
@AbsolemJackdaw
AbsolemJackdaw committed Nov 2, 2016

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: 91BE884FBA4B591A
Learn about vigilant mode
commit 7199549a5940313ee089d9eac989399a51b08c07
26 changes: 22 additions & 4 deletions src/main/java/net/minecraftforge/client/player/inventory/tabs/SurvivalTabList.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
/*
* Minecraft Forge
* Copyright (c) 2016.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.client.player.inventory.tabs;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing license header.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Licence header added


import java.util.Arrays;
import java.util.List;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiButton;
@@ -10,11 +29,10 @@
import net.minecraft.client.renderer.RenderItem;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.config.GuiUtils;

/**
* @author Subaraki
*
* Enclosing class to keep GuiContainer clean. This handles all the survival tab drawing, and the addition of two buttons.
* Enclosing class to keep GuiContainer clean. This handles all the survival tab drawing, and the addition of two buttons.
*/
public class SurvivalTabList
{
@@ -94,7 +112,7 @@ public void drawTabHoveringText(GuiContainer screen, int mouseX, int mouseY, int

private boolean renderSurvivalInventoryHoveringText(SurvivalTabs tab, GuiContainer screen, int mouseX, int mouseY, FontRenderer fontRendererObj)
{
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(Arrays.<String> asList(new String[] { I18n.format(tab.getLocalizedName()) }), mouseX,
GuiUtils.drawHoveringText(Arrays.<String> asList(new String[] { I18n.format(tab.getLocalizedName()) }), mouseX,
mouseY, screen.width, screen.height, -1, fontRendererObj);
return true;
}
22 changes: 19 additions & 3 deletions src/main/java/net/minecraftforge/client/player/inventory/tabs/SurvivalTabs.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*
* Minecraft Forge
* Copyright (c) 2016.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.client.player.inventory.tabs;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing license header

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Licence header added


import java.util.ArrayList;
@@ -19,9 +37,7 @@
import net.minecraft.util.ResourceLocation;

/**
* @author Subaraki
*
* class named after CreativeTabs, but for Survival
* class named after CreativeTabs, but for Survival
*/
public abstract class SurvivalTabs
{