Commit 939dc15940a6e1231367ec3f0a71745ab7e7eb06
1 parent
455f2c9c
moving Icon from client -> common
Showing
8 changed files
with
11 additions
and
10 deletions
java/client/com/mumfrey/liteloader/client/api/LiteLoaderBrandingProvider.java
| ... | ... | @@ -6,9 +6,9 @@ import net.minecraft.client.resources.I18n; |
| 6 | 6 | import net.minecraft.util.ResourceLocation; |
| 7 | 7 | |
| 8 | 8 | import com.mumfrey.liteloader.api.BrandingProvider; |
| 9 | -import com.mumfrey.liteloader.client.util.render.Icon; | |
| 10 | 9 | import com.mumfrey.liteloader.client.util.render.IconAbsolute; |
| 11 | 10 | import com.mumfrey.liteloader.core.LiteLoader; |
| 11 | +import com.mumfrey.liteloader.util.render.Icon; | |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * LiteLoader's branding provider | ... | ... |
java/client/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
| ... | ... | @@ -24,7 +24,6 @@ import com.mumfrey.liteloader.api.BrandingProvider; |
| 24 | 24 | import com.mumfrey.liteloader.api.LiteAPI; |
| 25 | 25 | import com.mumfrey.liteloader.api.ModInfoDecorator; |
| 26 | 26 | import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; |
| 27 | -import com.mumfrey.liteloader.client.util.render.Icon; | |
| 28 | 27 | import com.mumfrey.liteloader.core.LiteLoader; |
| 29 | 28 | import com.mumfrey.liteloader.core.LiteLoaderMods; |
| 30 | 29 | import com.mumfrey.liteloader.core.LiteLoaderVersion; |
| ... | ... | @@ -34,6 +33,7 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment; |
| 34 | 33 | import com.mumfrey.liteloader.launch.LoaderProperties; |
| 35 | 34 | import com.mumfrey.liteloader.modconfig.ConfigManager; |
| 36 | 35 | import com.mumfrey.liteloader.modconfig.ConfigPanel; |
| 36 | +import com.mumfrey.liteloader.util.render.Icon; | |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 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
| ... | ... | @@ -17,10 +17,10 @@ import org.lwjgl.input.Keyboard; |
| 17 | 17 | import com.mumfrey.liteloader.api.BrandingProvider; |
| 18 | 18 | import com.mumfrey.liteloader.api.LiteAPI; |
| 19 | 19 | import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; |
| 20 | -import com.mumfrey.liteloader.client.util.render.Icon; | |
| 21 | 20 | import com.mumfrey.liteloader.client.util.render.IconAbsolute; |
| 22 | 21 | import com.mumfrey.liteloader.core.LiteLoader; |
| 23 | 22 | import com.mumfrey.liteloader.util.SortableValue; |
| 23 | +import com.mumfrey.liteloader.util.render.Icon; | |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 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
| ... | ... | @@ -304,7 +304,7 @@ public class LoadingBar extends LoadingProgress |
| 304 | 304 | |
| 305 | 305 | glDisableTexture2D(); |
| 306 | 306 | glEnableBlend(); |
| 307 | - glEnableAlpha(); | |
| 307 | + glEnableAlphaTest(); | |
| 308 | 308 | glAlphaFunc(GL_GREATER, 0.0F); |
| 309 | 309 | glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
| 310 | 310 | |
| ... | ... | @@ -344,7 +344,7 @@ public class LoadingBar extends LoadingProgress |
| 344 | 344 | |
| 345 | 345 | this.fbo.framebufferRender(fboWidth, fboHeight); |
| 346 | 346 | |
| 347 | - glEnableAlpha(); | |
| 347 | + glEnableAlphaTest(); | |
| 348 | 348 | glAlphaFunc(GL_GREATER, 0.1F); |
| 349 | 349 | // glFlush(); |
| 350 | 350 | ... | ... |
java/client/com/mumfrey/liteloader/client/util/render/IconTiled.java
java/common/com/mumfrey/liteloader/api/BrandingProvider.java
java/client/com/mumfrey/liteloader/client/util/render/Icon.java renamed to java/common/com/mumfrey/liteloader/util/render/Icon.java
| 1 | -package com.mumfrey.liteloader.client.util.render; | |
| 1 | +package com.mumfrey.liteloader.util.render; | |
| 2 | 2 | |
| 3 | 3 | public interface Icon |
| 4 | 4 | { |
| ... | ... | @@ -6,9 +6,9 @@ public interface Icon |
| 6 | 6 | public abstract int getIconHeight(); |
| 7 | 7 | public abstract float getMinU(); |
| 8 | 8 | public abstract float getMaxU(); |
| 9 | - public abstract float getInterpolatedU(double p_94214_1_); | |
| 9 | + public abstract float getInterpolatedU(double slice); | |
| 10 | 10 | public abstract float getMinV(); |
| 11 | 11 | public abstract float getMaxV(); |
| 12 | - public abstract float getInterpolatedV(double p_94207_1_); | |
| 12 | + public abstract float getInterpolatedV(double slice); | |
| 13 | 13 | public abstract String getIconName(); |
| 14 | 14 | } | ... | ... |