Skip to content

Commit

Permalink
here's source
Browse files Browse the repository at this point in the history
  • Loading branch information
@IMS212
IMS212 committed Nov 16, 2023
1 parent ec89e55 commit e2a0d7d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
4 changes: 2 additions & 2 deletions buildscript/src/main/java/Buildscript.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
public class Buildscript extends SimpleFabricProject {
static final boolean SODIUM = true;
static final boolean CUSTOM_SODIUM = true;
static final String MC_VERSION = "23w45a";
static final String customSodiumName = "sodium-fabric-mc23w42a-0.5.3git.b1ba94f.jar";
static final String MC_VERSION = "23w46a";
static final String customSodiumName = "sodium-fabric-mc23w45a-0.5.3git.86b69d2-dirty.jar";

private static final String[] SOURCE_SETS = new String[] {
"main",
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/net/coderbot/iris/gui/element/IrisContainerObjectSelectionList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

public class IrisContainerObjectSelectionList<E extends ContainerObjectSelectionList.Entry<E>> extends ContainerObjectSelectionList<E> {
public IrisContainerObjectSelectionList(Minecraft client, int width, int height, int top, int bottom, int left, int right, int itemHeight) {
super(client, width, height, top, bottom, itemHeight);

this.x0 = left;
this.x1 = right;
super(client, width, height, top, itemHeight);
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/net/coderbot/iris/gui/element/IrisObjectSelectionList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

public class IrisObjectSelectionList<E extends AbstractSelectionList.Entry<E>> extends AbstractSelectionList<E> {
public IrisObjectSelectionList(Minecraft client, int width, int height, int top, int bottom, int left, int right, int itemHeight) {
super(client, width, height, top, bottom, itemHeight);

this.x0 = left;
this.x1 = right;
super(client, width, height, top, itemHeight);
}

@Override
Expand All @@ -26,7 +23,7 @@ public void select(int entry) {
}

@Override
public void updateNarration(NarrationElementOutput p0) {
public void updateWidgetNarration(NarrationElementOutput p0) {

}
}
9 changes: 5 additions & 4 deletions src/main/java/net/coderbot/iris/gui/element/ShaderPackOptionList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public ShaderPackOptionList(ShaderPackScreen screen, NavigationController naviga
super(client, width, height, top, bottom, left, right, 24);
this.navigation = navigation;
this.screen = screen;
this.setRenderBackground(false);

applyShaderPack(pack);
}
Expand All @@ -59,12 +60,12 @@ protected void renderDecorations(GuiGraphics pAbstractSelectionList0, int pInt1,
// Renders top/bottom dirt
int lvInt9 = 32;
pAbstractSelectionList0.setColor(0.25F, 0.25F, 0.25F, 1.0F);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.x0, 0, 0.0F, 0.0F, this.width, this.y0, 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.x0, this.y1, 0.0F, (float)this.y1, this.width, this.height - this.y1, 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.getX(), 0, 0.0F, 0.0F, this.width, this.getY(), 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.getX(), this.getBottom(), 0.0F, (float)this.getBottom(), this.width, this.height - this.getBottom(), 32, 32);
pAbstractSelectionList0.setColor(1.0F, 1.0F, 1.0F, 1.0F);
int lvInt10 = 4;
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.x0, this.y0, this.x1, this.y0 + 4, -16777216, 0, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.x0, this.y1 - 4, this.x1, this.y1, 0, -16777216, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.getX(), this.getY(), this.getRight(), this.getY() + 4, -16777216, 0, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.getX(), this.getBottom() - 4, this.getRight(), this.getBottom(), 0, -16777216, 0);
super.renderDecorations(pAbstractSelectionList0, pInt1, pInt2);
}

Expand Down
13 changes: 7 additions & 6 deletions src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public ShaderPackSelectionList(ShaderPackScreen screen, Minecraft client, int wi
super(client, width, height, top, bottom, left, right, 20);
WatchKey key1;
WatchService watcher1;
this.setRenderBackground(false);

this.screen = screen;
this.topButtonRow = new TopButtonRowEntry(this, Iris.getIrisConfig().areShadersEnabled());
Expand Down Expand Up @@ -84,7 +85,7 @@ public boolean keyPressed(int pContainerEventHandler0, int pInt1, int pInt2) {
}

@Override
public void render(GuiGraphics pAbstractSelectionList0, int pInt1, int pInt2, float pFloat3) {
public void renderWidget(GuiGraphics pAbstractSelectionList0, int pInt1, int pInt2, float pFloat3) {
if (keyValid) {
for (WatchEvent<?> event : key.pollEvents()) {
if (event.kind() == StandardWatchEventKinds.OVERFLOW) continue;
Expand All @@ -96,7 +97,7 @@ public void render(GuiGraphics pAbstractSelectionList0, int pInt1, int pInt2, fl
keyValid = key.reset();
}

super.render(pAbstractSelectionList0, pInt1, pInt2, pFloat3);
super.renderWidget(pAbstractSelectionList0, pInt1, pInt2, pFloat3);
}

public void close() throws IOException {
Expand Down Expand Up @@ -183,12 +184,12 @@ protected void renderDecorations(GuiGraphics pAbstractSelectionList0, int pInt1,
// Renders top/bottom dirt
int lvInt9 = 32;
pAbstractSelectionList0.setColor(0.25F, 0.25F, 0.25F, 1.0F);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.x0, 0, 0.0F, 0.0F, this.width, this.y0, 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.x0, this.y1, 0.0F, (float)this.y1, this.width, this.height - this.y1, 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.getX(), 0, 0.0F, 0.0F, this.width, this.getHeight(), 32, 32);
pAbstractSelectionList0.blit(Screen.BACKGROUND_LOCATION, this.getX(), this.getBottom(), 0.0F, (float)this.getBottom(), this.width, this.height - this.getBottom(), 32, 32);
pAbstractSelectionList0.setColor(1.0F, 1.0F, 1.0F, 1.0F);
int lvInt10 = 4;
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.x0, this.y0, this.x1, this.y0 + 4, -16777216, 0, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.x0, this.y1 - 4, this.x1, this.y1, 0, -16777216, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.getX(), this.getHeight(), this.getRight(), this.getHeight() + 4, -16777216, 0, 0);
pAbstractSelectionList0.fillGradient(RenderType.guiOverlay(), this.getX(), this.getBottom() - 4, this.getRight(), this.getBottom(), 0, -16777216, 0);
super.renderDecorations(pAbstractSelectionList0, pInt1, pInt2);
}

Expand Down

0 comments on commit e2a0d7d

Please sign in to comment.