Skip to content

Commit 1cde95f

Browse files
committed
fix: shader support
1 parent 5b6dc96 commit 1cde95f

File tree

4 files changed

+16
-25
lines changed

4 files changed

+16
-25
lines changed

src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static void func_147046_a(int p_147046_0_, int p_147046_1_, int p_147046_
102102
RenderHelper.disableStandardItemLighting();
103103
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
104104
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
105-
//GL11.glDisable(GL11.GL_TEXTURE_2D);
105+
GL11.glDisable(GL11.GL_TEXTURE_2D);
106106
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
107107
}
108108

src/main/java/shadersmod/client/BlockAliases.java

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -175,29 +175,20 @@ private static void loadBlockAliases(InputStream in, String path, List<List<Bloc
175175
}
176176
}
177177

178-
private static void addToList(List<List<BlockAlias>> blocksAliases, BlockAlias ba)
179-
{
180-
int[] blockIds = ba.getMatchBlockIds();
181-
182-
for (int i = 0; i < blockIds.length; ++i)
183-
{
184-
int blockId = blockIds[i];
185-
186-
while (blockId >= blocksAliases.size())
187-
{
188-
blocksAliases.addAll(null);
178+
private static void addToList(List<List<BlockAlias>> list, BlockAlias blockAlias) {
179+
int[] nArray = blockAlias.getMatchBlockIds();
180+
for (int i = 0; i < nArray.length; ++i) {
181+
int n = nArray[i];
182+
while (n >= list.size()) {
183+
list.add(null);
189184
}
190-
191-
List<BlockAlias> blockAliases = (List)blocksAliases.get(blockId);
192-
193-
if (blockAliases == null)
194-
{
195-
blockAliases = new ArrayList<>();
196-
blocksAliases.add(blockAliases);
185+
List<BlockAlias> list2 = list.get(n);
186+
if (list2 == null) {
187+
list2 = new ArrayList<BlockAlias>();
188+
list.set(n, list2);
197189
}
198-
199-
BlockAlias baBlock = new BlockAlias(ba.getBlockId(), ba.getMatchBlocks(blockId));
200-
((List)blockAliases).add(baBlock);
190+
BlockAlias blockAlias2 = new BlockAlias(blockAlias.getBlockId(), blockAlias.getMatchBlocks(n));
191+
list2.add(blockAlias2);
201192
}
202193
}
203194

src/main/java/shadersmod/client/Shaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
public class Shaders
8383
{
84-
static Minecraft mc;
84+
static Minecraft mc = Minecraft.getMinecraft();
8585
static EntityRenderer entityRenderer;
8686
public static boolean isInitializedOnce = false;
8787
public static boolean isShaderPackInitialized = false;

src/main/java/wtf/nebula/impl/module/render/Nametags.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void renderPlayerTag(EntityPlayer player, double x, double y, double z)
119119
glEnable(GL_DEPTH_TEST);
120120
glEnable(GL_LIGHTING);
121121

122-
RenderHelper.disableStandardItemLighting();
122+
RenderHelper.enableStandardItemLighting();
123123

124124
glEnable(GL_ALPHA_TEST);
125125

@@ -134,7 +134,7 @@ private void renderItem(ItemStack stack, int x, double scale) {
134134
// allow item GLINT to render for enchants
135135
glDepthMask(true);
136136
glScaled(scale, scale, scale);
137-
glClear(256);
137+
//glClear(256);
138138

139139
RenderHelper.enableStandardItemLighting();
140140
glEnable(GL_DEPTH_TEST);

0 commit comments

Comments
 (0)