-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Attempt to fix mixin conflicts with neo
- Loading branch information
1 parent
afedf9b
commit 5f9b4d4
Showing
12 changed files
with
538 additions
and
124 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
115 changes: 115 additions & 0 deletions
115
common/src/main/java/io/wispforest/condensed_creative/client/SlotRenderUtils.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,115 @@ | ||
| package io.wispforest.condensed_creative.client; | ||
|
|
||
| import com.mojang.blaze3d.systems.RenderSystem; | ||
| import io.wispforest.condensed_creative.CondensedCreative; | ||
| import io.wispforest.condensed_creative.entry.Entry; | ||
| import io.wispforest.condensed_creative.entry.impl.CondensedItemEntry; | ||
| import io.wispforest.condensed_creative.util.CondensedInventory; | ||
| import me.shedaniel.math.Color; | ||
| import net.minecraft.client.gui.DrawContext; | ||
| import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; | ||
| import net.minecraft.client.gui.screen.ingame.HandledScreen; | ||
| import net.minecraft.screen.slot.Slot; | ||
| import net.minecraft.util.Identifier; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| public class SlotRenderUtils { | ||
|
|
||
| private static final Identifier PLUS_ICON = CondensedCreative.createID("textures/gui/plus_logo.png"); | ||
| private static final Identifier MINUS_ICON = CondensedCreative.createID("textures/gui/minus_logo.png"); | ||
|
|
||
| public static void renderExtraIfEntry(HandledScreen screen, DrawContext context, Slot slot){ | ||
| if(!(screen instanceof CreativeInventoryScreen && slot.inventory instanceof CondensedInventory inv)) return; | ||
|
|
||
| Entry entryStack = inv.getEntryStack(slot.getIndex()); | ||
|
|
||
| if(!(entryStack instanceof CondensedItemEntry entry)) return; | ||
|
|
||
| int minX = slot.x; | ||
| int minY = slot.y; | ||
|
|
||
| int maxX = minX + 16; | ||
| int maxY = minY + 16; | ||
|
|
||
| if(CondensedItemEntry.CHILD_VISIBILITY.get(entry.condensedID)) { | ||
| Color backgroundColor = Color.ofTransparent(0x7F111111);//Color.ofRGBA(186, 186, 186, 255); | ||
|
|
||
| if(CondensedCreative.getConfig().entryBackgroundColor) { | ||
| var offset = CondensedCreative.getConfig().entryBorderColor ? 0 : 1; | ||
|
|
||
| context.fill(minX - offset, minY - offset, maxX + offset, maxY + offset, backgroundColor.getColor()); | ||
| } | ||
|
|
||
| if(CondensedCreative.getConfig().entryBorderColor) { | ||
| RenderSystem.enableBlend(); | ||
|
|
||
| Color outlineColor = Color.ofTransparent(CondensedCreative.getConfig().condensedEntryBorderColor);//Color.ofRGBA(251, 255, 0, 128); | ||
|
|
||
| if (!isSlotAbovePartOfCondensedEntry(slot, entry.condensedID)) { | ||
| context.fill(minX - 1, minY - 1, maxX + 1, maxY - 16, outlineColor.getColor()); | ||
| } | ||
|
|
||
| if (!isSlotBelowPartOfCondensedEntry(slot, entry.condensedID)) { | ||
| context.fill(minX - 1, minY + 16, maxX + 1, maxY + 1, outlineColor.getColor()); | ||
| } | ||
|
|
||
| if (!isSlotRightPartOfCondensedEntry(slot, entry.condensedID)) { | ||
| context.fill(minX + 16, minY - 1, maxX + 1, maxY + 1, outlineColor.getColor()); | ||
| } | ||
|
|
||
| if (!isSlotLeftPartOfCondensedEntry(slot, entry.condensedID)) { | ||
| context.fill(minX - 1, minY - 1, maxX - 16, maxY + 1, outlineColor.getColor()); | ||
| } | ||
| } | ||
|
|
||
| RenderSystem.disableBlend(); | ||
| } | ||
|
|
||
| if(!entry.isChild) { | ||
| Identifier id = !CondensedItemEntry.CHILD_VISIBILITY.get(entry.condensedID) ? PLUS_ICON : MINUS_ICON; | ||
|
|
||
| context.drawTexture(id, minX, minY, 160, 0, 0, 16, 16, 16, 16); | ||
| } | ||
| } | ||
|
|
||
| @Unique | ||
| public static boolean isSlotAbovePartOfCondensedEntry(Slot slot, Identifier condensedID){ | ||
| int topSlotIndex = slot.getIndex() - 9; | ||
|
|
||
| return topSlotIndex >= 0 && | ||
| ((CondensedInventory) slot.inventory).getEntryStack(topSlotIndex) instanceof CondensedItemEntry condensedItemEntry && | ||
| condensedID == condensedItemEntry.condensedID; | ||
| } | ||
|
|
||
| @Unique | ||
| public static boolean isSlotBelowPartOfCondensedEntry(Slot slot, Identifier condensedID){ | ||
| int bottomSlotIndex = slot.getIndex() + 9; | ||
|
|
||
| return bottomSlotIndex < slot.inventory.size() && | ||
| ((CondensedInventory) slot.inventory).getEntryStack(bottomSlotIndex) instanceof CondensedItemEntry condensedItemEntry && | ||
| condensedID == condensedItemEntry.condensedID; | ||
| } | ||
|
|
||
| @Unique | ||
| public static boolean isSlotLeftPartOfCondensedEntry(Slot slot, Identifier condensedID){ | ||
| if(((slot.id) % 9 == 0)) return false; | ||
|
|
||
| int leftSlotIndex = slot.getIndex() - 1; | ||
|
|
||
| return leftSlotIndex < slot.inventory.size() && | ||
| ((CondensedInventory) slot.inventory).getEntryStack(leftSlotIndex) instanceof CondensedItemEntry condensedItemEntry && | ||
| condensedID == condensedItemEntry.condensedID; | ||
| } | ||
|
|
||
| @Unique | ||
| public static boolean isSlotRightPartOfCondensedEntry(Slot slot, Identifier condensedID){ | ||
| if(((slot.id) % 9 == 8)) return false; | ||
|
|
||
| int rightSlotIndex = slot.getIndex() + 1; | ||
|
|
||
| return rightSlotIndex < slot.inventory.size() && | ||
| ((CondensedInventory) slot.inventory).getEntryStack(rightSlotIndex) instanceof CondensedItemEntry condensedItemEntry && | ||
| condensedID == condensedItemEntry.condensedID; | ||
| } | ||
| } |
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
20 changes: 20 additions & 0 deletions
20
...c/main/java/io/wispforest/condensed_creative/fabric/mixins/client/HandledScreenMixin.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,20 @@ | ||
| package io.wispforest.condensed_creative.fabric.mixins.client; | ||
|
|
||
| import io.wispforest.condensed_creative.client.SlotRenderUtils; | ||
| import net.minecraft.client.gui.DrawContext; | ||
| import net.minecraft.client.gui.screen.ingame.HandledScreen; | ||
| import net.minecraft.screen.ScreenHandler; | ||
| import net.minecraft.screen.slot.Slot; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(HandledScreen.class) | ||
| public abstract class HandledScreenMixin<T extends ScreenHandler> { | ||
|
|
||
| @Inject(method = "drawSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", shift = At.Shift.BY, by = 1)) | ||
| private void renderExtraIfEntry(DrawContext context, Slot slot, CallbackInfo ci){ | ||
| SlotRenderUtils.renderExtraIfEntry((HandledScreen) (Object) this, context, slot); | ||
| } | ||
| } |
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
Oops, something went wrong.