fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/slot/SlotCraftingMatrix.java → src/main/java/appeng/container/slot/CraftingMatrixSlot.java
+3 -3
View File
@@ -25,12 +25,12 @@ import net.minecraftforge.items.IItemHandler;
import appeng.container.AEBaseContainer;
import appeng.util.inv.WrapperInvItemHandler;
public class SlotCraftingMatrix extends AppEngSlot {
public class CraftingMatrixSlot extends AppEngSlot {
private final AEBaseContainer c;
private final IInventory wrappedInventory;
public SlotCraftingMatrix(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2,
final int par3, final int par4) {
public CraftingMatrixSlot(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2,
final int par3, final int par4) {
super(par1iInventory, par2, par3, par4);
this.c = c;
this.wrappedInventory = new WrapperInvItemHandler(par1iInventory);
src/main/java/appeng/container/slot/SlotCraftingTerm.java → src/main/java/appeng/container/slot/CraftingTermSlot.java
+11 -11
View File
@@ -43,10 +43,10 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.container.ContainerNull;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.implementations.CraftingTermContainer;
import appeng.helpers.IContainerCraftingPacket;
import appeng.helpers.InventoryAction;
import appeng.items.storage.ItemViewCell;
import appeng.items.storage.ViewCellItem;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.helpers.ItemHandlerUtil;
@@ -55,7 +55,7 @@ import appeng.util.inv.WrapperCursorItemHandler;
import appeng.util.inv.WrapperInvItemHandler;
import appeng.util.item.AEItemStack;
public class SlotCraftingTerm extends AppEngCraftingSlot {
public class CraftingTermSlot extends AppEngCraftingSlot {
private final IItemHandler craftInv;
private final IItemHandler pattern;
@@ -65,9 +65,9 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
private final IStorageMonitorable storage;
private final IContainerCraftingPacket container;
public SlotCraftingTerm(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc,
final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix,
final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) {
public CraftingTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc,
final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix,
final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) {
super(player, cMatrix, output, 0, x, y);
this.energySrc = energySrc;
this.storage = storage;
@@ -149,8 +149,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
// TODO: This is really hacky and NEEDS to be solved with a full container/gui
// refactoring.
protected IRecipe<CraftingInventory> findRecipe(CraftingInventory ic, World world) {
if (this.container instanceof ContainerCraftingTerm) {
final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container;
if (this.container instanceof CraftingTermContainer) {
final CraftingTermContainer containerTerminal = (CraftingTermContainer) this.container;
final IRecipe<CraftingInventory> recipe = containerTerminal.getCurrentRecipe();
if (recipe != null && recipe.matches(ic, world)) {
@@ -165,8 +165,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
// refactoring.
@Override
protected NonNullList<ItemStack> getRemainingItems(CraftingInventory ic, World world) {
if (this.container instanceof ContainerCraftingTerm) {
final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container;
if (this.container instanceof CraftingTermContainer) {
final CraftingTermContainer containerTerminal = (CraftingTermContainer) this.container;
final IRecipe<CraftingInventory> recipe = containerTerminal.getCurrentRecipe();
if (recipe != null && recipe.matches(ic, world)) {
@@ -230,7 +230,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
if (!this.getPattern().getStackInSlot(x).isEmpty()) {
set[x] = Platform.extractItemsByRecipe(this.energySrc, this.mySrc, inv, p.world, r, is, ic,
this.getPattern().getStackInSlot(x), x, all, Actionable.MODULATE,
ItemViewCell.createFilter(this.container.getViewCells()));
ViewCellItem.createFilter(this.container.getViewCells()));
ic.setInventorySlotContents(x, set[x]);
}
}
src/main/java/appeng/container/slot/SlotDisabled.java → src/main/java/appeng/container/slot/DisabledSlot.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class SlotDisabled extends AppEngSlot {
public class DisabledSlot extends AppEngSlot {
public SlotDisabled(final IItemHandler par1iInventory, final int slotIndex, final int x, final int y) {
public DisabledSlot(final IItemHandler par1iInventory, final int slotIndex, final int x, final int y) {
super(par1iInventory, slotIndex, x, y);
}
src/main/java/appeng/container/slot/SlotFakeBlacklist.java → src/main/java/appeng/container/slot/FakeBlacklistSlot.java
+2 -2
View File
@@ -20,9 +20,9 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotFakeBlacklist extends SlotFakeTypeOnly {
public class FakeBlacklistSlot extends FakeTypeOnlySlot {
public SlotFakeBlacklist(final IItemHandler inv, final int idx, final int x, final int y) {
public FakeBlacklistSlot(final IItemHandler inv, final int idx, final int x, final int y) {
super(inv, idx, x, y);
}
src/main/java/appeng/container/slot/SlotFakeCraftingMatrix.java → src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java
+2 -2
View File
@@ -20,9 +20,9 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotFakeCraftingMatrix extends SlotFake {
public class FakeCraftingMatrixSlot extends FakeSlot {
public SlotFakeCraftingMatrix(final IItemHandler inv, final int idx, final int x, final int y) {
public FakeCraftingMatrixSlot(final IItemHandler inv, final int idx, final int x, final int y) {
super(inv, idx, x, y);
}
}
src/main/java/appeng/container/slot/SlotFake.java → src/main/java/appeng/container/slot/FakeSlot.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class SlotFake extends AppEngSlot {
public class FakeSlot extends AppEngSlot {
public SlotFake(final IItemHandler inv, final int idx, final int x, final int y) {
public FakeSlot(final IItemHandler inv, final int idx, final int x, final int y) {
super(inv, idx, x, y);
}
src/main/java/appeng/container/slot/SlotFakeTypeOnly.java → src/main/java/appeng/container/slot/FakeTypeOnlySlot.java
+2 -2
View File
@@ -21,9 +21,9 @@ package appeng.container.slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class SlotFakeTypeOnly extends SlotFake {
public class FakeTypeOnlySlot extends FakeSlot {
public SlotFakeTypeOnly(final IItemHandler inv, final int idx, final int x, final int y) {
public FakeTypeOnlySlot(final IItemHandler inv, final int idx, final int x, final int y) {
super(inv, idx, x, y);
}
src/main/java/appeng/container/slot/SlotInaccessible.java → src/main/java/appeng/container/slot/InaccessibleSlot.java
+2 -2
View File
@@ -22,11 +22,11 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class SlotInaccessible extends AppEngSlot {
public class InaccessibleSlot extends AppEngSlot {
private ItemStack dspStack = ItemStack.EMPTY;
public SlotInaccessible(final IItemHandler i, final int slotIdx, final int x, final int y) {
public InaccessibleSlot(final IItemHandler i, final int slotIdx, final int x, final int y) {
super(i, slotIdx, x, y);
}
src/main/java/appeng/container/slot/SlotMolecularAssemblerPattern.java → src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java
+5 -5
View File
@@ -21,14 +21,14 @@ package appeng.container.slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import appeng.container.implementations.ContainerMolecularAssembler;
import appeng.container.implementations.MolecularAssemblerContainer;
public class SlotMolecularAssemblerPattern extends AppEngSlot {
public class MolecularAssemblerPatternSlot extends AppEngSlot {
private final ContainerMolecularAssembler mac;
private final MolecularAssemblerContainer mac;
public SlotMolecularAssemblerPattern(final ContainerMolecularAssembler mac, final IItemHandler i, final int slotIdx,
final int x, final int y) {
public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final IItemHandler i, final int slotIdx,
final int x, final int y) {
super(i, slotIdx, x, y);
this.mac = mac;
}
src/main/java/appeng/container/slot/SlotNormal.java → src/main/java/appeng/container/slot/NormalSlot.java
+2 -2
View File
@@ -20,9 +20,9 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotNormal extends AppEngSlot {
public class NormalSlot extends AppEngSlot {
public SlotNormal(final IItemHandler inv, final int slot, final int xPos, final int yPos) {
public NormalSlot(final IItemHandler inv, final int slot, final int xPos, final int yPos) {
super(inv, slot, xPos, yPos);
}
}
src/main/java/appeng/container/slot/OptionalSlotFake.java → src/main/java/appeng/container/slot/OptionalFakeSlot.java
+3 -3
View File
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class OptionalSlotFake extends SlotFake implements IOptionalSlot {
public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot {
private final int srcX;
private final int srcY;
@@ -31,8 +31,8 @@ public class OptionalSlotFake extends SlotFake implements IOptionalSlot {
private final IOptionalSlotHost host;
private boolean renderDisabled = true;
public OptionalSlotFake(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x,
final int y, final int offX, final int offY, final int groupNum) {
public OptionalFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x,
final int y, final int offX, final int offY, final int groupNum) {
super(inv, idx, x + offX * 18, y + offY * 18);
this.srcX = x;
this.srcY = y;
src/main/java/appeng/container/slot/OptionalSlotNormal.java → src/main/java/appeng/container/slot/OptionalNormalSlot.java
+3 -3
View File
@@ -20,13 +20,13 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class OptionalSlotNormal extends AppEngSlot implements IOptionalSlot {
public class OptionalNormalSlot extends AppEngSlot implements IOptionalSlot {
private final int groupNum;
private final IOptionalSlotHost host;
public OptionalSlotNormal(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot,
final int xPos, final int yPos, final int groupNum) {
public OptionalNormalSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot,
final int xPos, final int yPos, final int groupNum) {
super(inv, slot, xPos, yPos);
this.groupNum = groupNum;
this.host = containerBus;
src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java → src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java
+3 -3
View File
@@ -21,13 +21,13 @@ package appeng.container.slot;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraftforge.items.IItemHandler;
public class OptionalSlotRestrictedInput extends SlotRestrictedInput {
public class OptionalRestrictedInputSlot extends RestrictedInputSlot {
private final int groupNum;
private final IOptionalSlotHost host;
public OptionalSlotRestrictedInput(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host,
final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) {
public OptionalRestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host,
final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) {
super(valid, i, slotIndex, x, y, invPlayer);
this.groupNum = grpNum;
this.host = host;
src/main/java/appeng/container/slot/OptionalSlotFakeTypeOnly.java → src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java
+3 -3
View File
@@ -21,10 +21,10 @@ package appeng.container.slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class OptionalSlotFakeTypeOnly extends OptionalSlotFake {
public class OptionalTypeOnlyFakeSlot extends OptionalFakeSlot {
public OptionalSlotFakeTypeOnly(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx,
final int x, final int y, final int offX, final int offY, final int groupNum) {
public OptionalTypeOnlyFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx,
final int x, final int y, final int offX, final int offY, final int groupNum) {
super(inv, containerBus, idx, x, y, offX, offY, groupNum);
}
src/main/java/appeng/container/slot/SlotOutput.java → src/main/java/appeng/container/slot/OutputSlot.java
+2 -2
View File
@@ -21,9 +21,9 @@ package appeng.container.slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class SlotOutput extends AppEngSlot {
public class OutputSlot extends AppEngSlot {
public SlotOutput(final IItemHandler a, final int b, final int c, final int d, final int i) {
public OutputSlot(final IItemHandler a, final int b, final int c, final int d, final int i) {
super(a, b, c, d);
this.setIIcon(i);
}
src/main/java/appeng/container/slot/SlotPatternOutputs.java → src/main/java/appeng/container/slot/PatternOutputsSlot.java
+3 -3
View File
@@ -20,10 +20,10 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotPatternOutputs extends OptionalSlotFake {
public class PatternOutputsSlot extends OptionalFakeSlot {
public SlotPatternOutputs(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x,
final int y, final int offX, final int offY, final int groupNum) {
public PatternOutputsSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x,
final int y, final int offX, final int offY, final int groupNum) {
super(inv, containerBus, idx, x, y, offX, offY, groupNum);
}
src/main/java/appeng/container/slot/SlotPatternTerm.java → src/main/java/appeng/container/slot/PatternTermSlot.java
+9 -9
View File
@@ -27,27 +27,27 @@ import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.IActionSource;
import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.packets.PacketPatternSlot;
import appeng.core.sync.BasePacket;
import appeng.core.sync.packets.PatternSlotPacket;
import appeng.helpers.IContainerCraftingPacket;
public class SlotPatternTerm extends SlotCraftingTerm {
public class PatternTermSlot extends CraftingTermSlot {
private final int groupNum;
private final IOptionalSlotHost host;
public SlotPatternTerm(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc,
final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix,
final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber,
final IContainerCraftingPacket c) {
public PatternTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc,
final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix,
final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber,
final IContainerCraftingPacket c) {
super(player, mySrc, energySrc, storage, cMatrix, secondMatrix, output, x, y, c);
this.host = h;
this.groupNum = groupNumber;
}
public AppEngPacket getRequest(final boolean shift) {
return new PacketPatternSlot(this.getPattern(),
public BasePacket getRequest(final boolean shift) {
return new PatternSlotPacket(this.getPattern(),
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()),
shift);
}
src/main/java/appeng/container/slot/SlotPlayerHotBar.java → src/main/java/appeng/container/slot/PlayerHotBarSlot.java
+2 -2
View File
@@ -20,9 +20,9 @@ package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotPlayerHotBar extends AppEngSlot {
public class PlayerHotBarSlot extends AppEngSlot {
public SlotPlayerHotBar(final IItemHandler par1iInventory, final int par2, final int par3, final int par4) {
public PlayerHotBarSlot(final IItemHandler par1iInventory, final int par2, final int par3, final int par4) {
super(par1iInventory, par2, par3, par4);
this.setPlayerSide(true);
}
src/main/java/appeng/container/slot/SlotPlayerInv.java → src/main/java/appeng/container/slot/PlayerInvSlot.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraftforge.items.IItemHandler;
// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot.
public class SlotPlayerInv extends AppEngSlot {
public class PlayerInvSlot extends AppEngSlot {
public SlotPlayerInv(final IItemHandler par1iInventory, final int idx, final int x, final int y) {
public PlayerInvSlot(final IItemHandler par1iInventory, final int idx, final int x, final int y) {
super(par1iInventory, idx, x, y);
this.setPlayerSide(true);
src/main/java/appeng/container/slot/SlotRestrictedInput.java → src/main/java/appeng/container/slot/RestrictedInputSlot.java
+6 -7
View File
@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.ResourceLocation;
@@ -46,7 +45,7 @@ import appeng.api.implementations.items.IStorageComponent;
import appeng.api.implementations.items.IUpgradeModule;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.ICellWorkbenchItem;
import appeng.items.misc.ItemEncodedPattern;
import appeng.items.misc.EncodedPatternItem;
import appeng.recipes.handlers.GrinderRecipes;
import appeng.tile.misc.InscriberRecipes;
import appeng.util.Platform;
@@ -57,7 +56,7 @@ import appeng.util.Platform;
* @version rv2
* @since rv0
*/
public class SlotRestrictedInput extends AppEngSlot {
public class RestrictedInputSlot extends AppEngSlot {
private static final List<ResourceLocation> METAL_INGOT_TAGS = ImmutableList.of(
new ResourceLocation("forge:ingots/copper"), new ResourceLocation("forge:ingots/tin"),
@@ -71,8 +70,8 @@ public class SlotRestrictedInput extends AppEngSlot {
private boolean allowEdit = true;
private int stackLimit = -1;
public SlotRestrictedInput(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x,
final int y, final PlayerInventory p) {
public RestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x,
final int y, final PlayerInventory p) {
super(i, slotIndex, x, y);
this.which = valid;
this.setIIcon(valid.IIcon);
@@ -232,8 +231,8 @@ public class SlotRestrictedInput extends AppEngSlot {
public ItemStack getDisplayStack() {
if (Platform.isClient() && (this.which == PlacableItemType.ENCODED_PATTERN)) {
final ItemStack is = super.getStack();
if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) {
final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) {
final EncodedPatternItem iep = (EncodedPatternItem) is.getItem();
final ItemStack out = iep.getOutput(is);
if (!out.isEmpty()) {
return out;
src/main/java/appeng/container/slot/SlotInaccessibleHD.java
-28
View File
@@ -1,28 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.container.slot;
import net.minecraftforge.items.IItemHandler;
public class SlotInaccessibleHD extends SlotInaccessible {
public SlotInaccessibleHD(final IItemHandler i, final int slotIdx, final int x, final int y) {
super(i, slotIdx, x, y);
}
}