mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Fix naming conflicts with official names.
This commit is contained in:
1 parent
4dc34b7d5b
commit
e1863383ff
24 files changed
+72
-55
No files matched your search
@@ -19,8 +19,6 @@
|
||||
|
||||
package net.minecraftforge.fml.client.gui;
|
||||
|
||||
import static net.minecraft.util.StringUtils.stripControlCodes;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
@@ -75,6 +73,7 @@ import net.minecraftforge.forgespi.language.IModInfo;
|
||||
|
||||
public class GuiModList extends Screen
|
||||
{
|
||||
private static String stripControlCodes(String value) { return net.minecraft.util.StringUtils.stripControlCodes(value); }
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
private enum SortType implements Comparator<ModInfo>
|
||||
{
|
||||
@@ -172,7 +171,7 @@ public class GuiModList extends Screen
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getContentHeight()
|
||||
public int getContentHeight()
|
||||
{
|
||||
int height = 50;
|
||||
height += (lines.size() * font.FONT_HEIGHT);
|
||||
|
||||
@@ -29,12 +29,11 @@ import net.minecraftforge.fml.MavenVersionStringHelper;
|
||||
import net.minecraftforge.fml.VersionChecker;
|
||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||
|
||||
import static net.minecraft.util.StringUtils.stripControlCodes;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
|
||||
public class GuiSlotModList extends ExtendedList<GuiSlotModList.ModEntry>
|
||||
{
|
||||
private static String stripControlCodes(String value) { return net.minecraft.util.StringUtils.stripControlCodes(value); }
|
||||
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
|
||||
private final int listWidth;
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ public interface ICustomPacket<T extends IPacket<?>> {
|
||||
}
|
||||
}
|
||||
|
||||
default PacketBuffer getData() {
|
||||
default PacketBuffer getInternalData() {
|
||||
return Fields.lookup.get(this.getClass()).data.map(f->UnsafeHacks.<PacketBuffer>getField(f, this)).orElse(null);
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ public class NetworkEvent extends Event
|
||||
|
||||
private NetworkEvent(final ICustomPacket<?> payload, final Supplier<Context> source)
|
||||
{
|
||||
this.payload = payload.getData();
|
||||
this.payload = payload.getInternalData();
|
||||
this.source = source;
|
||||
this.loginIndex = payload.getIndex();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user