Skip to content

Commit

Permalink
Fix broken AW by yeeting it, bump version to 4.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Juuxel committed Jul 11, 2021
1 parent f2c643b commit 8e0570f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 27 deletions.
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ repositories {
}
}

loom {
accessWidener = file('src/main/resources/libgui.accesswidener')
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.11.6

# Mod Properties
mod_version = 4.1.3
mod_version = 4.1.4
maven_group = io.github.cottonmc
archives_base_name = LibGui

Expand Down
21 changes: 6 additions & 15 deletions src/main/java/io/github/cottonmc/cotton/gui/ValidatedSlot.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
public class ValidatedSlot extends Slot {
private static final VisualLogger LOGGER = new VisualLogger(ValidatedSlot.class);
private final int slotNumber;
// Original positions that will be restored when this slot is reshown
private final int originalX, originalY;
private boolean insertingAllowed = true;
private boolean takingAllowed = true;
private Predicate<ItemStack> filter;
Expand All @@ -28,8 +26,6 @@ public ValidatedSlot(Inventory inventory, int index, int x, int y) {
super(inventory, index, x, y);
if (inventory==null) throw new IllegalArgumentException("Can't make an itemslot from a null inventory!");
this.slotNumber = index;
this.originalX = x;
this.originalY = y;
}

@Override
Expand Down Expand Up @@ -148,6 +144,11 @@ public void addChangeListener(WItemSlot owner, WItemSlot.ChangeListener listener
listeners.put(owner, listener);
}

@Override
public boolean isEnabled() {
return isVisible();
}

/**
* Tests whether this slot is visible.
*
Expand All @@ -165,16 +166,6 @@ public boolean isVisible() {
* @since 3.0.0
*/
public void setVisible(boolean visible) {
if (this.visible != visible) {
this.visible = visible;

if (visible) {
x = originalX;
y = originalY;
} else {
x = -100000;
y = -100000;
}
}
this.visible = visible;
}
}
1 change: 0 additions & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"client": ["io.github.cottonmc.cotton.gui.impl.client.LibGuiClient"],
"modmenu": ["io.github.cottonmc.cotton.gui.impl.modmenu.ModMenuSupport"]
},
"accessWidener": "libgui.accesswidener",
"depends": {
"fabricloader": ">=0.11.0",
"fabric": "*",
Expand Down
6 changes: 0 additions & 6 deletions src/main/resources/libgui.accesswidener

This file was deleted.

0 comments on commit 8e0570f

Please sign in to comment.