Skip to content

Commit

Permalink
feat: switch to accessories
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jamalam360
Jamalam360 committed Jun 29, 2024
1 parent 34794dc commit 6a51591
Show file tree
Hide file tree
Showing 29 changed files with 224 additions and 412 deletions.
10 changes: 5 additions & 5 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ allprojects {
name = "TerraformersMC Maven"
url = "https://maven.terraformersmc.com"
}

maven {
name = "Cardinal Components Maven"
url = "https://maven.ladysnake.org/releases"
name = "Su5ed Maven"
url = "https://maven.su5ed.dev/releases"
}

maven {
name = "TheIllusiveC4's Maven"
url = "https://maven.theillusivec4.top"
name = "Wisp Forests Maven"
url = "https://maven.wispforest.io/releases"
}
}

Expand Down
3 changes: 3 additions & 0 deletions common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ dependencies {
modImplementation libs.fabric.loader
modImplementation libs.architectury.common
modImplementation libs.jamlib.common
modImplementation(libs.accessories.common) {
exclude group: "mezz.jei"
}
compileOnly libs.mixin.extras.common
annotationProcessor libs.mixin.extras.common
}
297 changes: 156 additions & 141 deletions common/src/main/java/io/github/jamalam360/utility_belt/UtilityBeltItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@

import io.github.jamalam360.utility_belt.UtilityBeltInventory.Mutable;
import io.github.jamalam360.utility_belt.client.ClientNetworking;

import java.util.List;
import java.util.function.Consumer;

import io.wispforest.accessories.Accessories;
import io.wispforest.accessories.api.AccessoryItem;
import io.wispforest.accessories.api.DropRule;
import io.wispforest.accessories.api.slot.SlotEntryReference;
import io.wispforest.accessories.api.slot.SlotReference;
import io.wispforest.accessories.api.slot.SlotType;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.Mth;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.SlotAccess;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.ClickAction;
Expand All @@ -26,144 +34,151 @@
import net.minecraft.world.item.TridentItem;
import org.jetbrains.annotations.Nullable;

public class UtilityBeltItem extends Item {

private static final int BAR_COLOR = Mth.color(0.4F, 0.4F, 1.0F);

public UtilityBeltItem() {
super(new Item.Properties().stacksTo(1).component(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.EMPTY));
}

@SuppressWarnings("BooleanMethodIsAlwaysInverted")
private static boolean handleStack(ItemStack stack, UtilityBeltInventory.Mutable inv, Consumer<ItemStack> slotAccess) {
if (stack.isEmpty()) {
for (int i = 0; i < inv.getContainerSize(); i++) {
if (!inv.getItem(i).isEmpty()) {
ItemStack removed = inv.removeItemNoUpdate(i);
slotAccess.accept(removed);
return true;
}
}
} else if (isValidItem(stack)) {
for (int i = 0; i < inv.getContainerSize(); i++) {
if (inv.getItem(i).isEmpty()) {
inv.setItem(i, stack);
slotAccess.accept(ItemStack.EMPTY);
return true;
}
}
}

return false;
}

private static void playInsertSound(Entity entity) {
entity.playSound(SoundEvents.BUNDLE_INSERT, 0.8F, 0.8F + entity.level().getRandom().nextFloat() * 0.4F);
}

public static boolean isValidItem(ItemStack stack) {
return stack.getItem() instanceof TieredItem || stack.getItem() instanceof ProjectileWeaponItem || stack.getItem() instanceof FishingRodItem || stack.getItem() instanceof SpyglassItem || stack.getItem() instanceof TridentItem || stack.getItem() instanceof FlintAndSteelItem || stack.getItem() instanceof ShearsItem || stack.getItem() instanceof BrushItem || stack.isEmpty() || stack.is(UtilityBelt.ALLOWED_IN_UTILITY_BELT);
}

// Going to keep this name as is until 1.20.4 support is dropped, to keep the diffs smaller
public static UtilityBeltInventory getInventoryFromTag(ItemStack stack) {
if (!stack.has(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get())) {
stack.set(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.EMPTY);
}

return stack.get(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get());
}

// This should only be called by the state managers, or when the belt is NOT equipped
public static void setInventory(ItemStack stack, UtilityBeltInventory inv) {
stack.set(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), inv);
}

@Nullable
public static ItemStack getBelt(Player player) {
ItemStack stack = UtilityBeltPlatform.getStackInBeltSlot(player);

if (stack != null && stack.getItem() == UtilityBelt.UTILITY_BELT_ITEM.get()) {
return stack;
} else {
return null;
}
}

@Override
public boolean isBarVisible(ItemStack itemStack) {
return getInventoryFromTag(itemStack).items().stream().anyMatch(s -> !s.isEmpty());
}

@Override
public int getBarWidth(ItemStack itemStack) {
long size = getInventoryFromTag(itemStack).items().stream().filter((s) -> !s.isEmpty()).count();
return size == 4L ? 13 : (int) (size * 3);
}

@Override
public int getBarColor(ItemStack itemStack) {
return BAR_COLOR;
}

@Override
public void appendHoverText(ItemStack itemStack, TooltipContext tooltipContext, List<Component> list, TooltipFlag tooltipFlag) {
UtilityBeltInventory inv = getInventoryFromTag(itemStack);

for (int i = 0; i < inv.getContainerSize(); i++) {
ItemStack stack = inv.getItem(i);
if (!stack.isEmpty()) {
list.add(Component.literal("- ").append(stack.getHoverName()));
}
}
}

@Override
public boolean overrideStackedOnOther(ItemStack belt, Slot slot, ClickAction clickAction, Player player) {
if (clickAction != ClickAction.SECONDARY || !slot.allowModification(player)) {
return false;
}

ItemStack slotStack = slot.getItem();
UtilityBeltInventory.Mutable inv = new Mutable(getInventoryFromTag(belt));

if (!handleStack(slotStack, inv, slot::set)) {
return false;
}

playInsertSound(player);
setInventory(belt, inv.toImmutable());
return true;
}

@Override
public boolean overrideOtherStackedOnMe(ItemStack belt, ItemStack otherStack, Slot slot, ClickAction clickAction, Player player, SlotAccess slotAccess) {
if (clickAction != ClickAction.SECONDARY || !slot.allowModification(player)) {
return false;
}

UtilityBeltInventory.Mutable inv = new Mutable(getInventoryFromTag(belt));

if (!handleStack(otherStack, inv, slotAccess::set)) {
return false;
}

playInsertSound(player);
setInventory(belt, inv.toImmutable());
return true;
}

public void onEquip(LivingEntity wearer, ItemStack belt) {
if (wearer instanceof Player player && !player.level().isClientSide) {
StateManager.getServerInstance().setInventory(player, new Mutable(getInventoryFromTag(belt)));
}
}

public void onUnequip(LivingEntity wearer) {
if (wearer instanceof Player player && player.level().isClientSide) {
StateManager.getClientInstance().setInBelt(player, false);
StateManager.getClientInstance().setSelectedBeltSlot(player, 0);
ClientNetworking.sendNewStateToServer(false, 0, false);
}
}
public class UtilityBeltItem extends AccessoryItem {

private static final int BAR_COLOR = Mth.color(0.4F, 0.4F, 1.0F);

public UtilityBeltItem() {
super(new Item.Properties().stacksTo(1).component(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.EMPTY));
}

@SuppressWarnings("BooleanMethodIsAlwaysInverted")
private static boolean handleStack(ItemStack stack, UtilityBeltInventory.Mutable inv, Consumer<ItemStack> slotAccess) {
if (stack.isEmpty()) {
for (int i = 0; i < inv.getContainerSize(); i++) {
if (!inv.getItem(i).isEmpty()) {
ItemStack removed = inv.removeItemNoUpdate(i);
slotAccess.accept(removed);
return true;
}
}
} else if (isValidItem(stack)) {
for (int i = 0; i < inv.getContainerSize(); i++) {
if (inv.getItem(i).isEmpty()) {
inv.setItem(i, stack);
slotAccess.accept(ItemStack.EMPTY);
return true;
}
}
}

return false;
}

private static void playInsertSound(Entity entity) {
entity.playSound(SoundEvents.BUNDLE_INSERT, 0.8F, 0.8F + entity.level().getRandom().nextFloat() * 0.4F);
}

public static boolean isValidItem(ItemStack stack) {
return stack.getItem() instanceof TieredItem || stack.getItem() instanceof ProjectileWeaponItem || stack.getItem() instanceof FishingRodItem || stack.getItem() instanceof SpyglassItem || stack.getItem() instanceof TridentItem || stack.getItem() instanceof FlintAndSteelItem || stack.getItem() instanceof ShearsItem || stack.getItem() instanceof BrushItem || stack.isEmpty() || stack.is(UtilityBelt.ALLOWED_IN_UTILITY_BELT);
}

// Going to keep this name as is until 1.20.4 support is dropped, to keep the diffs smaller
public static UtilityBeltInventory getInventoryFromTag(ItemStack stack) {
if (!stack.has(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get())) {
stack.set(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.EMPTY);
}

return stack.get(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get());
}

// This should only be called by the state managers, or when the belt is NOT equipped
public static void setInventory(ItemStack stack, UtilityBeltInventory inv) {
stack.set(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), inv);
}

@Nullable
public static ItemStack getBelt(Player player) {
@Nullable SlotEntryReference slot = player.accessoriesCapability().getFirstEquipped(UtilityBelt.UTILITY_BELT_ITEM.get());

if (slot != null) {
return slot.stack();
} else {
return null;
}
}

@Override
public boolean isBarVisible(ItemStack itemStack) {
return getInventoryFromTag(itemStack).items().stream().anyMatch(s -> !s.isEmpty());
}

@Override
public int getBarWidth(ItemStack itemStack) {
long size = getInventoryFromTag(itemStack).items().stream().filter((s) -> !s.isEmpty()).count();
return size == 4L ? 13 : (int) (size * 3);
}

@Override
public int getBarColor(ItemStack itemStack) {
return BAR_COLOR;
}

@Override
public void appendHoverText(ItemStack itemStack, TooltipContext tooltipContext, List<Component> list, TooltipFlag tooltipFlag) {
UtilityBeltInventory inv = getInventoryFromTag(itemStack);

for (int i = 0; i < inv.getContainerSize(); i++) {
ItemStack stack = inv.getItem(i);
if (!stack.isEmpty()) {
list.add(Component.literal("- ").append(stack.getHoverName()));
}
}
}

@Override
public boolean overrideStackedOnOther(ItemStack belt, Slot slot, ClickAction clickAction, Player player) {
if (clickAction != ClickAction.SECONDARY || !slot.allowModification(player)) {
return false;
}

ItemStack slotStack = slot.getItem();
UtilityBeltInventory.Mutable inv = new Mutable(getInventoryFromTag(belt));

if (!handleStack(slotStack, inv, slot::set)) {
return false;
}

playInsertSound(player);
setInventory(belt, inv.toImmutable());
return true;
}

@Override
public boolean overrideOtherStackedOnMe(ItemStack belt, ItemStack otherStack, Slot slot, ClickAction clickAction, Player player, SlotAccess slotAccess) {
if (clickAction != ClickAction.SECONDARY || !slot.allowModification(player)) {
return false;
}

UtilityBeltInventory.Mutable inv = new Mutable(getInventoryFromTag(belt));

if (!handleStack(otherStack, inv, slotAccess::set)) {
return false;
}

playInsertSound(player);
setInventory(belt, inv.toImmutable());
return true;
}

@Override
public void onUnequip(ItemStack stack, SlotReference reference) {
if (reference.entity() instanceof Player player && player.level().isClientSide) {
StateManager.getClientInstance().setInBelt(player, false);
StateManager.getClientInstance().setSelectedBeltSlot(player, 0);
ClientNetworking.sendNewStateToServer(false, 0, false);
}
}

@Override
public void onEquip(ItemStack stack, SlotReference reference) {
if (reference.entity() instanceof Player player && !player.level().isClientSide) {
StateManager.getServerInstance().setInventory(player, new Mutable(getInventoryFromTag(stack)));
}
}

@Override
public DropRule getDropRule(ItemStack stack, SlotReference reference, DamageSource source) {
return DropRule.DROP;
}
}
14 changes: 0 additions & 14 deletions common/src/main/java/io/github/jamalam360/utility_belt/UtilityBeltPlatform.java
View file

This file was deleted.

5 changes: 3 additions & 2 deletions common/src/main/java/io/github/jamalam360/utility_belt/client/BeltHotbarRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.github.jamalam360.utility_belt.UtilityBeltInventory;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.GameRenderer;
Expand All @@ -20,7 +21,7 @@ public class BeltHotbarRenderer {
.id("textures/gui/utility_belt_widget.png");
private static final ResourceLocation HOTBAR_SELECTION_SPRITE = ResourceLocation.withDefaultNamespace("hud/hotbar_selection");

public static void render(GuiGraphics graphics, float tickDelta) {
public static void render(GuiGraphics graphics, DeltaTracker deltaTracker) {
Player player = Minecraft.getInstance().player;
StateManager stateManager = StateManager.getClientInstance();

Expand Down Expand Up @@ -52,7 +53,7 @@ public static void render(GuiGraphics graphics, float tickDelta) {
int m = 1;

for (int n = 0; n < inv.getContainerSize(); ++n) {
renderHotbarItem(graphics, x, y + n * 20 + 3, tickDelta, player, inv.getItem(n), m++);
renderHotbarItem(graphics, x, y + n * 20 + 3, deltaTracker.getGameTimeDeltaTicks(), player, inv.getItem(n), m++);
}
}
}
Expand Down
Loading

0 comments on commit 6a51591

Please sign in to comment.