PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Some minor tidying up

Browse source
This commit is contained in:
Sollace 2018-10-20 13:49:49 +02:00
parent 8d0c0a629e
commit 1676c237e8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java
View file

@ -21,13 +21,13 @@ import net.minecraft.crash.CrashReport;
@Mixin(value = Minecraft.class, priority = 9000) @Mixin(value = Minecraft.class, priority = 9000)
public abstract class MixinMinecraft { public abstract class MixinMinecraft {
// //
// Due to how JFrame works the only way to know for sure when the game hash crashed // Due to how JFrame works the only way to know for sure when the game has crashed
// is to have it call us explicitly. // is to have it call us directly.
// //
// ShutdownListener.onShutDown is unlikely to be called as it depends on the // ShutdownListener.onShutDown is unlikely to be called as it depends on the
// Minecraft.running flag to be unset, which is unlikely to happen if the game crashes. // Minecraft.running flag to be unset, which is unlikely to happen if the game crashes.
// //
// Runtime.current().addShutdownHook won't be called it waits for all // Runtime.current().addShutdownHook won't be called as it waits for all
// non-daemon threads to end, one of which is depending on the JFrame being // non-daemon threads to end, one of which is depending on the JFrame being
// disposed to tell it when to end. // disposed to tell it when to end.
// //
@ -68,7 +68,7 @@ public abstract class MixinMinecraft {
// [!!!DO NOT REMOVE!!!] // [!!!DO NOT REMOVE!!!]
// //
// I'm serious, do not remove. // I'm serious, do not remove.
// I don't care how much of a vendeta you have aginst mixins. // I don't care how much of a vendeta you have against mixins.
// //
//public void displayCrashReport(CrashReport crashReportIn) //public void displayCrashReport(CrashReport crashReportIn)
@Inject(method = "displayCrashReport(Lnet/minecraft/crash/CrashReport;)V", at = @At("HEAD")) @Inject(method = "displayCrashReport(Lnet/minecraft/crash/CrashReport;)V", at = @At("HEAD"))

4
src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java
View file

@ -20,7 +20,7 @@ import java.awt.event.ComponentEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.List;
import java.util.TooManyListenersException; import java.util.TooManyListenersException;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@ -210,7 +210,7 @@ public class GLWindow extends DropTarget {
// //
DefaultResourcePack pack = (DefaultResourcePack) mc.getResourcePackRepository().rprDefaultResourcePack; DefaultResourcePack pack = (DefaultResourcePack) mc.getResourcePackRepository().rprDefaultResourcePack;
ArrayList<Image> images = Lists.newArrayList( List<Image> images = Lists.newArrayList(
ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_16x16.png"))), ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_16x16.png"))),
ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_32x32.png"))) ImageIO.read(pack.getInputStreamAssets(new ResourceLocation("icons/icon_32x32.png")))
); );