Update MCP mappings to 20170617

This commit is contained in:
mezz committed 2017-06-17 18:06:04 -07:00
1 parent 3d322ef925
commit c2845967cc
27 files changed
+95 -88

No files matched your search

@@ -123,10 +123,10 @@ public class FMLConfigGuiFactory implements IModGuiFactory
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
textFieldValue.setTextColor((int) (Math.random() * 0xFFFFFF));
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
}
}
@@ -86,7 +86,7 @@ public class GuiErrorBase extends GuiErrorScreen
{
for(GuiButton button : buttonList)
{
button.func_191745_a(this.mc, mouseX, mouseY, partialTicks);
button.drawButton(this.mc, mouseX, mouseY, partialTicks);
}
}
}
@@ -61,7 +61,7 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback
for (k = 0; k < this.buttonList.size(); ++k)
{
this.buttonList.get(k).func_191745_a(this.mc, mouseX, mouseY, partialTicks);
this.buttonList.get(k).drawButton(this.mc, mouseX, mouseY, partialTicks);
}
for (k = 0; k < this.labelList.size(); ++k)
@@ -48,7 +48,7 @@ public class GuiButtonExt extends GuiButton
* Draws this button to the screen.
*/
@Override
public void func_191745_a(Minecraft mc, int mouseX, int mouseY, float partial)
public void drawButton(Minecraft mc, int mouseX, int mouseY, float partial)
{
if (this.visible)
{
@@ -42,7 +42,7 @@ public class GuiCheckBox extends GuiButton
}
@Override
public void func_191745_a(Minecraft mc, int mouseX, int mouseY, float partial)
public void drawButton(Minecraft mc, int mouseX, int mouseY, float partial)
{
if (this.visible)
{
@@ -84,7 +84,7 @@ public class GuiConfigEntries extends GuiListExtended
{
super(mc, parent.width, parent.height, parent.titleLine2 != null ? 33 : 23, parent.height - 32, 20);
this.owningScreen = parent;
this.func_193651_b(false);
this.setShowSelectionBox(false);
this.mc = mc;
this.listEntries = new ArrayList<IConfigEntry>();
@@ -562,10 +562,10 @@ public class GuiConfigEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
this.btnValue.packedFGColour = GuiUtils.getColorCode(this.configElement.getValidValues()[currentIndex].charAt(0), true);
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
}
@Override
@@ -910,14 +910,14 @@ public class GuiConfigEntries extends GuiListExtended
public abstract void valueButtonPressed(int slotIndex);
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
this.btnValue.width = this.owningEntryList.controlWidth;
this.btnValue.x = this.owningScreen.entryList.controlX;
this.btnValue.y = y;
this.btnValue.enabled = enabled();
this.btnValue.func_191745_a(this.mc, mouseX, mouseY, partial);
this.btnValue.drawButton(this.mc, mouseX, mouseY, partial);
}
/**
@@ -1190,9 +1190,9 @@ public class GuiConfigEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
this.textFieldValue.x = this.owningEntryList.controlX + 2;
this.textFieldValue.y = y + 1;
this.textFieldValue.width = this.owningEntryList.controlWidth - 4;
@@ -1326,14 +1326,14 @@ public class GuiConfigEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
this.btnSelectCategory.x = listWidth / 2 - 150;
this.btnSelectCategory.y = y;
this.btnSelectCategory.enabled = enabled();
this.btnSelectCategory.func_191745_a(this.mc, mouseX, mouseY, partial);
this.btnSelectCategory.drawButton(this.mc, mouseX, mouseY, partial);
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
}
@Override
@@ -1526,7 +1526,7 @@ public class GuiConfigEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
boolean isChanged = isChanged();
@@ -1545,12 +1545,12 @@ public class GuiConfigEntries extends GuiListExtended
this.btnUndoChanges.x = this.owningEntryList.scrollBarX - 44;
this.btnUndoChanges.y = y;
this.btnUndoChanges.enabled = enabled() && isChanged;
this.btnUndoChanges.func_191745_a(this.mc, mouseX, mouseY, partial);
this.btnUndoChanges.drawButton(this.mc, mouseX, mouseY, partial);
this.btnDefault.x = this.owningEntryList.scrollBarX - 22;
this.btnDefault.y = y;
this.btnDefault.enabled = enabled() && !isDefault();
this.btnDefault.func_191745_a(this.mc, mouseX, mouseY, partial);
this.btnDefault.drawButton(this.mc, mouseX, mouseY, partial);
if (this.tooltipHoverChecker == null)
this.tooltipHoverChecker = new HoverChecker(y, y + slotHeight, x, this.owningScreen.entryList.controlX - 8, 800);
@@ -60,7 +60,7 @@ public class GuiEditArrayEntries extends GuiListExtended
this.configElement = configElement;
this.beforeValues = beforeValues;
this.currentValues = currentValues;
this.func_193651_b(false);
this.setShowSelectionBox(false);
this.isChanged = !Arrays.deepEquals(beforeValues, currentValues);
this.isDefault = Arrays.deepEquals(currentValues, configElement.getDefaults());
this.canAddMoreEntries = !configElement.isListLengthFixed() && (configElement.getMaxListLength() == -1 || currentValues.length < configElement.getMaxListLength());
@@ -450,9 +450,9 @@ public class GuiEditArrayEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
if (configElement.isListLengthFixed() || slotIndex != owningEntryList.listEntries.size() - 1)
{
this.textFieldValue.setVisible(true);
@@ -516,9 +516,9 @@ public class GuiEditArrayEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
super.func_192634_a(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partial);
this.btnValue.x = listWidth / 4;
this.btnValue.y = y;
@@ -529,7 +529,7 @@ public class GuiEditArrayEntries extends GuiListExtended
this.btnValue.displayString = String.valueOf(value);
btnValue.packedFGColour = value ? GuiUtils.getColorCode('2', true) : GuiUtils.getColorCode('4', true);
this.btnValue.func_191745_a(owningEntryList.getMC(), mouseX, mouseY, partial);
this.btnValue.drawButton(owningEntryList.getMC(), mouseX, mouseY, partial);
}
@Override
@@ -593,7 +593,7 @@ public class GuiEditArrayEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
if (this.getValue() != null && this.isValidated)
owningEntryList.getMC().fontRenderer.drawString(
@@ -608,7 +608,7 @@ public class GuiEditArrayEntries extends GuiListExtended
this.btnAddNewEntryAbove.visible = true;
this.btnAddNewEntryAbove.x = half + ((half / 2) - 44);
this.btnAddNewEntryAbove.y = y;
this.btnAddNewEntryAbove.func_191745_a(owningEntryList.getMC(), mouseX, mouseY, partial);
this.btnAddNewEntryAbove.drawButton(owningEntryList.getMC(), mouseX, mouseY, partial);
}
else
this.btnAddNewEntryAbove.visible = false;
@@ -618,7 +618,7 @@ public class GuiEditArrayEntries extends GuiListExtended
this.btnRemoveEntry.visible = true;
this.btnRemoveEntry.x = half + ((half / 2) - 22);
this.btnRemoveEntry.y = y;
this.btnRemoveEntry.func_191745_a(owningEntryList.getMC(), mouseX, mouseY, partial);
this.btnRemoveEntry.drawButton(owningEntryList.getMC(), mouseX, mouseY, partial);
}
else
this.btnRemoveEntry.visible = false;
@@ -54,7 +54,7 @@ public class GuiSelectStringEntries extends GuiListExtended
this.mc = mc;
this.configElement = configElement;
this.selectableValues = selectableValues;
this.func_193651_b(true);
this.setShowSelectionBox(true);
listEntries = new ArrayList<IGuiSelectStringListEntry>();
@@ -173,7 +173,7 @@ public class GuiSelectStringEntries extends GuiListExtended
}
@Override
public void func_192634_a(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partial)
{
owningList.mc.fontRenderer.drawString(value.getValue(), x + 1, y, slotIndex == owningList.selectedIndex ? 16777215 : 14737632);
}
@@ -41,7 +41,7 @@ public class GuiUnicodeGlyphButton extends GuiButtonExt
}
@Override
public void func_191745_a(Minecraft mc, int mouseX, int mouseY, float partial)
public void drawButton(Minecraft mc, int mouseX, int mouseY, float partial)
{
if (this.visible)
{
@@ -53,7 +53,7 @@ public class ClientRegistry
public static <T extends TileEntity> void bindTileEntitySpecialRenderer(Class<T> tileEntityClass, TileEntitySpecialRenderer<? super T> specialRenderer)
{
TileEntityRendererDispatcher.instance.mapSpecialRenderers.put(tileEntityClass, specialRenderer);
TileEntityRendererDispatcher.instance.renderers.put(tileEntityClass, specialRenderer);
specialRenderer.setRendererDispatcher(TileEntityRendererDispatcher.instance);
}