From ff33572ff0ba2b7ba447d85f8dbe0028645b26cb Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 3 Aug 2016 19:19:52 -0500 Subject: [PATCH] Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash --- build.properties | 2 +- src/main/java/mekanism/client/gui/GuiMItemStackFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiMMaterialFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTItemStackFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTMaterialFilter.java | 2 +- src/main/java/mekanism/common/content/miner/MinerFilter.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index aaa615497..ca167bcdb 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.10.2 mappings_version=snapshot_20160627 forge_version=12.18.1.2014 -mcmp_version=1.2.0_72 +mcmp_version=1.2.0_74 jei_version=3.7.6.231 mod_version=9.1.0 diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 6937b402e..81ae3c518 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -124,7 +124,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(filter.itemType != null) { - fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.itemType != null) diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 12fa8ee13..10c155e57 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -125,7 +125,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.materialItem != null) diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 29a7540c3..c53ea7733 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -181,7 +181,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(filter.itemType != null) { - fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 89); } if(filter.itemType != null) diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index f62beedd1..c6c8323f4 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -129,7 +129,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00); + renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); } if(filter.materialItem != null) diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 433eda34a..f7f93eb8b 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -60,7 +60,7 @@ public abstract class MinerFilter if(dataStream.readBoolean()) { - replaceStack = new ItemStack(Block.getBlockById(dataStream.readInt()), 1, dataStream.readInt()); + replaceStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt()); } else { replaceStack = null;