dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mappings and dependencies

Browse Source
This commit is contained in:
raoulvdberge
2017-04-01 21:02:19 +02:00
parent c8af65f7bb
commit 9472e2cbec
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# Refined Storage Changelog
### 1.4.2
- Updated Forge to 2261 (raoulvdberge)
- Implemented support for the Forge update JSON system (raoulvdberge)
- Added integration for MCMultiPart, this is an optional dependency (raoulvdberge)
- You can now specify more items to export, import, filter, etc by inserting the Filter item (raoulvdberge)

11
build.gradle
View File

@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
minecraft {
version = "1.11.2-13.20.0.2232"
version = "1.11.2-13.20.0.2261"
runDir = "run"
useDepAts = true
mappings = "snapshot_20161206"
mappings = "snapshot_20170401"
}
repositories {
@@ -51,10 +51,10 @@ repositories {
}
dependencies {
deobfCompile "mezz.jei:jei_1.11.2:4.2.6.238:api"
runtime "mezz.jei:jei_1.11.2:4.2.6.238"
deobfCompile "mezz.jei:jei_1.11.2:4.2.10.248:api"
runtime "mezz.jei:jei_1.11.2:4.2.10.248"
deobfCompile "net.darkhax.tesla:Tesla:1.11-1.3.0.51"
deobfCompile "org.cyclops.cyclopscore:CyclopsCore:1.11.2-0.9.2-483"
deobfCompile "org.cyclops.cyclopscore:CyclopsCore:1.11.2-0.10.0-516"
deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.1-95"
deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_16"
}
@@ -76,7 +76,6 @@ processResources {
jar {
include "com/raoulvdberge/refinedstorage/**"
include "powercrystals/minefactoryreloaded/api/**"
include "com/jaquadro/minecraft/storagedrawers/api/**"
include "assets/**"
include "mcmod.info"

6
src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
View File

@@ -62,13 +62,13 @@ public class BlockCable extends BlockNode {
@Override
protected BlockStateContainer createBlockState() {
return super.createBlockStateBuilder()
.add(NORTH)
.add(NORTH)
.add(EAST)
.add(SOUTH)
.add(WEST)
.add(UP)
.add(DOWN)
.build();
.add(DOWN)
.build();
}
@Override

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
View File

@@ -250,7 +250,7 @@ public abstract class GuiBase extends GuiContainer {
}
public void drawItemOverlay(ItemStack stack, String text, int x, int y) {
itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
itemRender.renderItemOverlayIntoGUI(fontRenderer, stack, x, y, "");
if (text != null) {
drawQuantity(x, y, text);
@@ -258,7 +258,7 @@ public abstract class GuiBase extends GuiContainer {
}
public void drawQuantity(int x, int y, String qty) {
boolean large = fontRendererObj.getUnicodeFlag() || RS.INSTANCE.config.largeFont;
boolean large = fontRenderer.getUnicodeFlag() || RS.INSTANCE.config.largeFont;
GlStateManager.pushMatrix();
GlStateManager.translate(x, y, 1);
@@ -274,7 +274,7 @@ public abstract class GuiBase extends GuiContainer {
GlStateManager.blendFunc(770, 771);
GlStateManager.disableDepth();
fontRendererObj.drawStringWithShadow(qty, (large ? 16 : 30) - fontRendererObj.getStringWidth(qty), large ? 8 : 22, 16777215);
fontRenderer.drawStringWithShadow(qty, (large ? 16 : 30) - fontRenderer.getStringWidth(qty), large ? 8 : 22, 16777215);
GlStateManager.enableDepth();
GlStateManager.enableTexture2D();
@@ -290,7 +290,7 @@ public abstract class GuiBase extends GuiContainer {
public void drawString(int x, int y, String message, int color) {
GlStateManager.disableLighting();
fontRendererObj.drawString(message, x, y, color);
fontRenderer.drawString(message, x, y, color);
GlStateManager.enableLighting();
}
@@ -304,7 +304,7 @@ public abstract class GuiBase extends GuiContainer {
public void drawTooltip(@Nonnull ItemStack stack, int x, int y, List<String> lines) {
GlStateManager.disableLighting();
GuiUtils.drawHoveringText(stack, lines, x, y, width - guiLeft, height, -1, fontRendererObj);
GuiUtils.drawHoveringText(stack, lines, x, y, width - guiLeft, height, -1, fontRenderer);
GlStateManager.enableLighting();
}

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -73,8 +73,8 @@ public class GuiCraftingMonitor extends GuiBase {
String cancel = t("gui.cancel");
String cancelAll = t("misc.refinedstorage:cancel_all");
int cancelButtonWidth = 14 + fontRendererObj.getStringWidth(cancel);
int cancelAllButtonWidth = 14 + fontRendererObj.getStringWidth(cancelAll);
int cancelButtonWidth = 14 + fontRenderer.getStringWidth(cancel);
int cancelAllButtonWidth = 14 + fontRenderer.getStringWidth(cancelAll);
cancelButton = addButton(x + 7, y + 113, cancelButtonWidth, 20, cancel, false);
cancelAllButton = addButton(x + 7 + cancelButtonWidth + 4, y + 113, cancelAllButtonWidth, 20, cancelAll, false);

2
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java
View File

@@ -29,7 +29,7 @@ public class GuiDetector extends GuiBase {
addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_NBT));
addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_OREDICT));
AMOUNT = new GuiTextField(0, fontRendererObj, x + 41 + 1, y + 23 + 1, 50, fontRendererObj.FONT_HEIGHT);
AMOUNT = new GuiTextField(0, fontRenderer, x + 41 + 1, y + 23 + 1, 50, fontRenderer.FONT_HEIGHT);
AMOUNT.setText(String.valueOf(TileDetector.AMOUNT.getValue()));
AMOUNT.setEnableBackgroundDrawing(false);
AMOUNT.setVisible(true);

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFilter.java
View File

@@ -41,7 +41,7 @@ public class GuiFilter extends GuiBase {
toggleModFilter = addCheckBox(0, y + 71 + 25, t("gui.refinedstorage:filter.mod_filter"), modFilter);
toggleMode = addButton(x + 7, y + 71 + 21, 0, 20, "");
updateModeButton(mode);
nameField = new GuiTextField(0, fontRendererObj, x + 34, y + 121, 137 - 6, fontRendererObj.FONT_HEIGHT);
nameField = new GuiTextField(0, fontRenderer, x + 34, y + 121, 137 - 6, fontRenderer.FONT_HEIGHT);
nameField.setText(name);
nameField.setEnableBackgroundDrawing(false);
nameField.setVisible(true);
@@ -53,7 +53,7 @@ public class GuiFilter extends GuiBase {
private void updateModeButton(int mode) {
String text = mode == ItemFilter.MODE_WHITELIST ? t("sidebutton.refinedstorage:mode.whitelist") : t("sidebutton.refinedstorage:mode.blacklist");
toggleMode.setWidth(fontRendererObj.getStringWidth(text) + 12);
toggleMode.setWidth(fontRenderer.getStringWidth(text) + 12);
toggleMode.displayString = text;
toggleModFilter.xPosition = toggleMode.xPosition + toggleMode.getButtonWidth() + 4;
}

2
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java
View File

@@ -47,7 +47,7 @@ public class GuiReaderWriter extends GuiBase {
add = addButton(x + 128, y + 15, 20, 20, "+");
remove = addButton(x + 150, y + 15, 20, 20, "-");
name = new GuiTextField(0, fontRendererObj, x + 8 + 1, y + 20 + 1, 107, fontRendererObj.FONT_HEIGHT);
name = new GuiTextField(0, fontRenderer, x + 8 + 1, y + 20 + 1, 107, fontRenderer.FONT_HEIGHT);
name.setEnableBackgroundDrawing(false);
name.setVisible(true);
name.setTextColor(16777215);

2
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
View File

@@ -60,7 +60,7 @@ public class GuiStorage extends GuiBase {
addSideButton(new SideButtonAccessType(this, gui.getAccessTypeParameter()));
}
int buttonWidth = 10 + fontRendererObj.getStringWidth(t("misc.refinedstorage:priority"));
int buttonWidth = 10 + fontRenderer.getStringWidth(t("misc.refinedstorage:priority"));
priorityButton = addButton(x + 169 - buttonWidth, y + 41, buttonWidth, 20, t("misc.refinedstorage:priority"));
}

2
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java
View File

@@ -83,7 +83,7 @@ public class GuiCraftingStart extends GuiBase {
startButton = addButton(x + pos.getFirst(), y + pos.getSecond(), 50, 20, getStartButtonText());
cancelButton = addButton(x + pos.getFirst(), y + pos.getSecond() + 24, 50, 20, t("gui.cancel"));
amountField = new GuiTextField(0, fontRendererObj, x + getAmountPos().getFirst(), y + getAmountPos().getSecond(), 69 - 6, fontRendererObj.FONT_HEIGHT);
amountField = new GuiTextField(0, fontRenderer, x + getAmountPos().getFirst(), y + getAmountPos().getSecond(), 69 - 6, fontRenderer.FONT_HEIGHT);
amountField.setEnableBackgroundDrawing(false);
amountField.setVisible(true);
amountField.setText(String.valueOf(getAmount()));

2
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -127,7 +127,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
int sy = y + 6 + 1 + getTabDelta();
if (searchField == null) {
searchField = new GuiTextField(0, fontRendererObj, sx, sy, 88 - 6, fontRendererObj.FONT_HEIGHT);
searchField = new GuiTextField(0, fontRenderer, sx, sy, 88 - 6, fontRenderer.FONT_HEIGHT);
searchField.setEnableBackgroundDrawing(false);
searchField.setVisible(true);
searchField.setTextColor(16777215);

2
src/main/java/com/raoulvdberge/refinedstorage/network/MessageHandlerPlayerToServer.java
View File

@@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
public abstract class MessageHandlerPlayerToServer<T extends IMessage> implements IMessageHandler<T, IMessage> {
@Override
public IMessage onMessage(final T message, MessageContext context) {
final EntityPlayerMP player = context.getServerHandler().playerEntity;
final EntityPlayerMP player = context.getServerHandler().player;
player.getServerWorld().addScheduledTask(() -> handle(message, player));

2
src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
View File

@@ -118,7 +118,7 @@ public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRe
float factor = 2.0f;
GlStateManager.scale(size * factor, size * factor, size);
Minecraft.getMinecraft().fontRendererObj.drawString(amount, 0, 0, 0xFFFFFF);
Minecraft.getMinecraft().fontRenderer.drawString(amount, 0, 0, 0xFFFFFF);
GlStateManager.popMatrix();

8
src/main/resources/pack.mcmeta
View File

@@ -1,6 +1,6 @@
{
"pack": {
"description": "Refined Storage resources",
"pack_format": 3
}
"pack": {
"description": "Refined Storage resources",
"pack_format": 3
}
}