LiteLoader / LiteLoader · Commits

Commit 939dc15940a6e1231367ec3f0a71745ab7e7eb06

Authored by Mumfrey
1 parent 455f2c9c

moving Icon from client -> common

Inline Side-by-side
Showing 8 changed files with 11 additions and 10 deletions
java/client/com/mumfrey/liteloader/client/api/LiteLoaderBrandingProvider.java
  View file @939dc15
@@ -6,9 +6,9 @@ import net.minecraft.client.resources.I18n; @@ -6,9 +6,9 @@ import net.minecraft.client.resources.I18n;
6 import net.minecraft.util.ResourceLocation; 6 import net.minecraft.util.ResourceLocation;
7 7
8 import com.mumfrey.liteloader.api.BrandingProvider; 8 import com.mumfrey.liteloader.api.BrandingProvider;
9 -import com.mumfrey.liteloader.client.util.render.Icon;  
10 import com.mumfrey.liteloader.client.util.render.IconAbsolute; 9 import com.mumfrey.liteloader.client.util.render.IconAbsolute;
11 import com.mumfrey.liteloader.core.LiteLoader; 10 import com.mumfrey.liteloader.core.LiteLoader;
  11 +import com.mumfrey.liteloader.util.render.Icon;
12 12
13 /** 13 /**
14 * LiteLoader's branding provider 14 * LiteLoader's branding provider
java/client/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
  View file @939dc15
@@ -24,7 +24,6 @@ import com.mumfrey.liteloader.api.BrandingProvider; @@ -24,7 +24,6 @@ import com.mumfrey.liteloader.api.BrandingProvider;
24 import com.mumfrey.liteloader.api.LiteAPI; 24 import com.mumfrey.liteloader.api.LiteAPI;
25 import com.mumfrey.liteloader.api.ModInfoDecorator; 25 import com.mumfrey.liteloader.api.ModInfoDecorator;
26 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; 26 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
27 -import com.mumfrey.liteloader.client.util.render.Icon;  
28 import com.mumfrey.liteloader.core.LiteLoader; 27 import com.mumfrey.liteloader.core.LiteLoader;
29 import com.mumfrey.liteloader.core.LiteLoaderMods; 28 import com.mumfrey.liteloader.core.LiteLoaderMods;
30 import com.mumfrey.liteloader.core.LiteLoaderVersion; 29 import com.mumfrey.liteloader.core.LiteLoaderVersion;
@@ -34,6 +33,7 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment; @@ -34,6 +33,7 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment;
34 import com.mumfrey.liteloader.launch.LoaderProperties; 33 import com.mumfrey.liteloader.launch.LoaderProperties;
35 import com.mumfrey.liteloader.modconfig.ConfigManager; 34 import com.mumfrey.liteloader.modconfig.ConfigManager;
36 import com.mumfrey.liteloader.modconfig.ConfigPanel; 35 import com.mumfrey.liteloader.modconfig.ConfigPanel;
  36 +import com.mumfrey.liteloader.util.render.Icon;
37 37
38 /** 38 /**
39 * GUI screen which displays info about loaded mods and also allows them to be enabled and 39 * GUI screen which displays info about loaded mods and also allows them to be enabled and
java/client/com/mumfrey/liteloader/client/gui/GuiPanelAbout.java
  View file @939dc15
@@ -17,10 +17,10 @@ import org.lwjgl.input.Keyboard; @@ -17,10 +17,10 @@ import org.lwjgl.input.Keyboard;
17 import com.mumfrey.liteloader.api.BrandingProvider; 17 import com.mumfrey.liteloader.api.BrandingProvider;
18 import com.mumfrey.liteloader.api.LiteAPI; 18 import com.mumfrey.liteloader.api.LiteAPI;
19 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; 19 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
20 -import com.mumfrey.liteloader.client.util.render.Icon;  
21 import com.mumfrey.liteloader.client.util.render.IconAbsolute; 20 import com.mumfrey.liteloader.client.util.render.IconAbsolute;
22 import com.mumfrey.liteloader.core.LiteLoader; 21 import com.mumfrey.liteloader.core.LiteLoader;
23 import com.mumfrey.liteloader.util.SortableValue; 22 import com.mumfrey.liteloader.util.SortableValue;
  23 +import com.mumfrey.liteloader.util.render.Icon;
24 24
25 /** 25 /**
26 * "About LiteLoader" panel which docks in the mod info screen and lists information about the installed APIs 26 * "About LiteLoader" panel which docks in the mod info screen and lists information about the installed APIs
java/client/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
  View file @939dc15
@@ -304,7 +304,7 @@ public class LoadingBar extends LoadingProgress @@ -304,7 +304,7 @@ public class LoadingBar extends LoadingProgress
304 304
305 glDisableTexture2D(); 305 glDisableTexture2D();
306 glEnableBlend(); 306 glEnableBlend();
307 - glEnableAlpha(); 307 + glEnableAlphaTest();
308 glAlphaFunc(GL_GREATER, 0.0F); 308 glAlphaFunc(GL_GREATER, 0.0F);
309 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 309 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
310 310
@@ -344,7 +344,7 @@ public class LoadingBar extends LoadingProgress @@ -344,7 +344,7 @@ public class LoadingBar extends LoadingProgress
344 344
345 this.fbo.framebufferRender(fboWidth, fboHeight); 345 this.fbo.framebufferRender(fboWidth, fboHeight);
346 346
347 - glEnableAlpha(); 347 + glEnableAlphaTest();
348 glAlphaFunc(GL_GREATER, 0.1F); 348 glAlphaFunc(GL_GREATER, 0.1F);
349 // glFlush(); 349 // glFlush();
350 350
java/client/com/mumfrey/liteloader/client/util/render/IconTiled.java
  View file @939dc15
1 package com.mumfrey.liteloader.client.util.render; 1 package com.mumfrey.liteloader.client.util.render;
2 2
  3 +import com.mumfrey.liteloader.util.render.Icon;
  4 +
3 import net.minecraft.util.ResourceLocation; 5 import net.minecraft.util.ResourceLocation;
4 6
5 public class IconTiled implements Icon 7 public class IconTiled implements Icon
java/common/com/mumfrey/liteloader/api/BrandingProvider.java
  View file @939dc15
@@ -4,7 +4,7 @@ import java.net.URI; @@ -4,7 +4,7 @@ import java.net.URI;
4 4
5 import net.minecraft.util.ResourceLocation; 5 import net.minecraft.util.ResourceLocation;
6 6
7 -import com.mumfrey.liteloader.client.util.render.Icon; 7 +import com.mumfrey.liteloader.util.render.Icon;
8 8
9 /** 9 /**
10 * LiteLoader Extensible API - Branding Provider 10 * LiteLoader Extensible API - Branding Provider
java/client/com/mumfrey/liteloader/client/util/render/Icon.java renamed to java/common/com/mumfrey/liteloader/util/render/Icon.java
  View file @939dc15
1 -package com.mumfrey.liteloader.client.util.render; 1 +package com.mumfrey.liteloader.util.render;
2 2
3 public interface Icon 3 public interface Icon
4 { 4 {
@@ -6,9 +6,9 @@ public interface Icon @@ -6,9 +6,9 @@ public interface Icon
6 public abstract int getIconHeight(); 6 public abstract int getIconHeight();
7 public abstract float getMinU(); 7 public abstract float getMinU();
8 public abstract float getMaxU(); 8 public abstract float getMaxU();
9 - public abstract float getInterpolatedU(double p_94214_1_); 9 + public abstract float getInterpolatedU(double slice);
10 public abstract float getMinV(); 10 public abstract float getMinV();
11 public abstract float getMaxV(); 11 public abstract float getMaxV();
12 - public abstract float getInterpolatedV(double p_94207_1_); 12 + public abstract float getInterpolatedV(double slice);
13 public abstract String getIconName(); 13 public abstract String getIconName();
14 } 14 }
java/common/com/mumfrey/liteloader/util/render/IconTextured.java
  View file @939dc15
1 package com.mumfrey.liteloader.util.render; 1 package com.mumfrey.liteloader.util.render;
2 2
3 -import com.mumfrey.liteloader.client.util.render.Icon;  
4 import net.minecraft.util.ResourceLocation; 3 import net.minecraft.util.ResourceLocation;
5 4
6 /** 5 /**