-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix BogoSorter Sorting 'Locked' Slots
- Loading branch information
1 parent
a49b0cf
commit 3e5c0ab
Showing
8 changed files
with
126 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
src/main/java/com/nomiceu/nomilabs/mixin/bogosorter/SortHandlerMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package com.nomiceu.nomilabs.mixin.bogosorter; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import net.minecraft.entity.player.EntityPlayer; | ||
| import net.minecraft.item.ItemStack; | ||
|
|
||
| import org.jetbrains.annotations.UnmodifiableView; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| import com.cleanroommc.bogosorter.api.ISlot; | ||
| import com.cleanroommc.bogosorter.common.sort.SlotGroup; | ||
| import com.cleanroommc.bogosorter.common.sort.SortHandler; | ||
|
|
||
| /** | ||
| * Prevents Modification of 'Locked' Slots. | ||
| */ | ||
| @Mixin(value = SortHandler.class, remap = false) | ||
| public class SortHandlerMixin { | ||
|
|
||
| @Shadow | ||
| @Final | ||
| private EntityPlayer player; | ||
|
|
||
| @Redirect(method = "sortHorizontal", | ||
| at = @At(value = "INVOKE", | ||
| target = "Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;getSlots()Ljava/util/List;")) | ||
| private @UnmodifiableView List<ISlot> checkLockedSlots1(SlotGroup instance) { | ||
| return labs$getSlotsLogic(instance); | ||
| } | ||
|
|
||
| @Redirect(method = "gatherItems", | ||
| at = @At(value = "INVOKE", | ||
| target = "Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;getSlots()Ljava/util/List;")) | ||
| private @UnmodifiableView List<ISlot> checkLockedSlots2(SlotGroup instance) { | ||
| return labs$getSlotsLogic(instance); | ||
| } | ||
|
|
||
| @Redirect(method = "clearAllItems", | ||
| at = @At(value = "INVOKE", | ||
| target = "Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;getSlots()Ljava/util/List;")) | ||
| private @UnmodifiableView List<ISlot> checkLockedSlots3(SlotGroup instance) { | ||
| return labs$getSlotsLogic(instance); | ||
| } | ||
|
|
||
| @Redirect(method = "randomizeItems", | ||
| at = @At(value = "INVOKE", | ||
| target = "Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;getSlots()Ljava/util/List;")) | ||
| private @UnmodifiableView List<ISlot> checkLockedSlots4(SlotGroup instance) { | ||
| return labs$getSlotsLogic(instance); | ||
| } | ||
|
|
||
| /** | ||
| * Sort Bogo is static, so we need to redirect calls of it | ||
| */ | ||
| @Redirect(method = "sort(Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;Z)V", | ||
| at = @At(value = "INVOKE", | ||
| target = "Lcom/cleanroommc/bogosorter/common/sort/SortHandler;sortBogo(Lcom/cleanroommc/bogosorter/common/sort/SlotGroup;)V")) | ||
| private void newSortBogo(SlotGroup instance) { | ||
| List<ItemStack> items = new ArrayList<>(); | ||
|
|
||
| for (var slot : labs$getSlotsLogic(instance)) { | ||
| ItemStack stack = slot.bogo$getStack(); | ||
| items.add(stack); | ||
| } | ||
|
|
||
| Collections.shuffle(items); | ||
| List<ISlot> slots = labs$getSlotsLogic(instance); | ||
|
|
||
| for (int i = 0; i < slots.size(); i++) { | ||
| ISlot slot = slots.get(i); | ||
| slot.bogo$putStack(items.get(i)); | ||
| } | ||
| } | ||
|
|
||
| @Unique | ||
| private @UnmodifiableView List<ISlot> labs$getSlotsLogic(SlotGroup instance) { | ||
| var slots = instance.getSlots(); | ||
| List<ISlot> result = new ArrayList<>(); | ||
|
|
||
| for (var slot : slots) { | ||
| if (slot.bogo$canTakeStack(player)) result.add(slot); | ||
| } | ||
| return result; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "package": "com.nomiceu.nomilabs.mixin.bogosorter", | ||
| "refmap": "mixins.nomilabs.refmap.json", | ||
| "target": "@env(DEFAULT)", | ||
| "minVersion": "0.8", | ||
| "compatibilityLevel": "JAVA_8", | ||
| "mixins": [ | ||
| "SortHandlerMixin" | ||
| ], | ||
| "client": [], | ||
| "server": [] | ||
| } |