Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 07:13:28 +01:00
Code Issues Projects Releases Wiki Activity

more things.

Browse source
This commit is contained in:
Flanks255 2024-07-24 17:22:57 -05:00
parent adce5984e4
commit 8cc262156e
16 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java
View file

@ -10,6 +10,7 @@ import net.neoforged.neoforge.common.Tags;
import net.neoforged.neoforge.common.data.BlockTagsProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.concurrent.CompletableFuture;
@ -19,7 +20,7 @@ public class BlockTagsGenerator extends BlockTagsProvider {
}
@Override
protected void addTags(HolderLookup.Provider provider) {
protected void addTags(@Nonnull HolderLookup.Provider provider) {
tag(BlockTags.WALLS).add(
ActuallyBlocks.ETHETIC_WHITE_WALL.get(),
ActuallyBlocks.ETHETIC_GREEN_WALL.get(),
@ -179,6 +180,7 @@ public class BlockTagsGenerator extends BlockTagsProvider {
/**
* Gets a name for this provider, to use in logging.
*/
@Nonnull
@Override
public String getName() {
return "Block Tags";

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
View file

@ -14,7 +14,6 @@ import com.mojang.datafixers.util.Pair;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot;
@ -72,7 +71,7 @@ public class ContainerEnergizer extends AbstractContainerMenu {
@Override
public boolean mayPlace(ItemStack stack) {
return StackUtil.isValid(stack) && stack.getItem() instanceof ArmorItem;
return !stack.isEmpty() && stack.getItem() instanceof ArmorItem;
}
@Override
@ -131,7 +130,7 @@ public class ContainerEnergizer extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java
View file

@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -85,7 +84,7 @@ public class ContainerFarmer extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java
View file

@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -75,7 +74,7 @@ public class ContainerFeeder extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java
View file

@ -11,7 +11,6 @@
package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -69,7 +68,7 @@ public class ContainerFermentingBarrel extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java
View file

@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable;
import de.ellpeck.actuallyadditions.mod.items.DrillItem;
import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -91,7 +90,7 @@ public class ContainerFilter extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java
View file

@ -11,7 +11,6 @@
package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -76,7 +75,7 @@ public class ContainerFluidCollector extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

5
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java
View file

@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityPoweredFurnace;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -87,7 +86,7 @@ public class ContainerFurnaceDouble extends AbstractContainerMenu {
ItemStack recipeOutput = recipeHolder.value().getResultItem(player.level().registryAccess());
//Shift from Inventory
if (StackUtil.isValid(recipeOutput)) {
if (!recipeOutput.isEmpty()) {
if (!this.moveItemStackTo(newStack, TileEntityPoweredFurnace.SLOT_INPUT_1, TileEntityPoweredFurnace.SLOT_INPUT_1 + 1, false)) {
if (!this.moveItemStackTo(newStack, TileEntityPoweredFurnace.SLOT_INPUT_2, TileEntityPoweredFurnace.SLOT_INPUT_2 + 1, false)) {
return ItemStack.EMPTY;
@ -107,7 +106,7 @@ public class ContainerFurnaceDouble extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java
View file

@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemAdvanced;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -81,7 +80,7 @@ public class ContainerLaserRelayItemWhitelist extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java
View file

@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityVerticalDigger;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -80,7 +79,7 @@ public class ContainerMiner extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

9
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java
View file

@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditio
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -22,6 +21,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.ItemStack;
import javax.annotation.Nonnull;
import java.util.Objects;
public class ContainerXPSolidifier extends AbstractContainerMenu {
@ -49,8 +49,9 @@ public class ContainerXPSolidifier extends AbstractContainerMenu {
}
}
@Nonnull
@Override
public ItemStack quickMoveStack(Player player, int slot) {
public ItemStack quickMoveStack(@Nonnull Player player, int slot) {
int inventoryStart = 2;
int inventoryEnd = inventoryStart + 26;
int hotbarStart = inventoryEnd + 1;
@ -79,7 +80,7 @@ public class ContainerXPSolidifier extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();
@ -96,7 +97,7 @@ public class ContainerXPSolidifier extends AbstractContainerMenu {
}
@Override
public boolean stillValid(Player player) {
public boolean stillValid(@Nonnull Player player) {
return this.solidifier.canPlayerUse(player);
}
}

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/CrusherContainer.java
View file

@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditio
import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityCrusher;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
@ -111,7 +110,7 @@ public class CrusherContainer extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
if (!StackUtil.isValid(newStack)) {
if (newStack.isEmpty()) {
theSlot.set(ItemStack.EMPTY);
} else {
theSlot.setChanged();

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/SackContainer.java
View file

@ -84,6 +84,10 @@ public class SackContainer extends AbstractContainerMenu implements IButtonReact
}
}
public FilterSettings getFilter() {
return filter;
}
@Nonnull
@Override
public ItemStack quickMoveStack(@Nonnull Player player, int slot) {

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/SackGui.java
View file

@ -48,7 +48,7 @@ public class SackGui extends AAScreen<SackContainer> {
public void init() {
super.init();
this.filter = new FilterSettingsGui(this.container.filter, this.leftPos + 137, this.topPos + 10, true, this::addRenderableWidget, this::buttonClicked, 1);
this.filter = new FilterSettingsGui(this.container.getFilter(), this.leftPos + 137, this.topPos + 10, true, this::addRenderableWidget, this::buttonClicked, 1);
this.buttonAutoInsert = Button.builder(
Component.literal("I")

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java
View file

@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.slot;
import de.ellpeck.actuallyadditions.mod.items.ItemFilter;
import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.Slot;
@ -52,7 +51,7 @@ public class SlotFilter extends SlotItemHandlerUnconditioned {
}
this.set(ItemStack.EMPTY);
} else if (StackUtil.isValid(cursorItem)) {
} else if (!cursorItem.isEmpty()) {
if (!isFilter(stackInSlot)) {
ItemStack s = cursorItem.copy();
s.setCount(1);

3
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java
View file

@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.items;
import de.ellpeck.actuallyadditions.api.misc.IGoggles;
import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA;
import de.ellpeck.actuallyadditions.mod.material.ArmorMaterials;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import io.netty.util.internal.ConcurrentSet;
import net.minecraft.client.Minecraft;
import net.minecraft.world.entity.Entity;
@ -46,7 +45,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles {
public static boolean isWearing(Player player) {
ItemStack face = player.getInventory().armor.get(3);
return StackUtil.isValid(face) && face.getItem() instanceof IGoggles;
return !face.isEmpty() && face.getItem() instanceof IGoggles;
}