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

More Renames

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-02 02:38:10 +02:00
parent fc300745cd
commit d4c9e5c490
9 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerCraftingTerm.java
+2 -2
View File
@@ -21,7 +21,7 @@ package appeng.container.implementations;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
@@ -80,7 +80,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE
public void onCraftMatrixChanged( IInventory inventory )
{
final ContainerNull cn = new ContainerNull();
final InventoryCrafting ic = new InventoryCrafting( cn, 3, 3 );
final CraftingInventory ic = new CraftingInventory( cn, 3, 3 );
for( int x = 0; x < 9; x++ )
{
src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+4 -4
View File
@@ -28,7 +28,7 @@ import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.InventoryCraftResult;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotCrafting;
import net.minecraft.item.ItemStack;
@@ -163,7 +163,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
private ItemStack getAndUpdateOutput()
{
final World world = this.getPlayerInv().player.world;
final InventoryCrafting ic = new InventoryCrafting( this, 3, 3 );
final CraftingInventory ic = new CraftingInventory( this, 3, 3 );
for( int x = 0; x < ic.getSizeInventory(); x++ )
{
@@ -402,8 +402,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
return;
}
final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
final InventoryCrafting real = new InventoryCrafting( new ContainerNull(), 3, 3 );
final CraftingInventory ic = new CraftingInventory( new ContainerNull(), 3, 3 );
final CraftingInventory real = new CraftingInventory( new ContainerNull(), 3, 3 );
for( int x = 0; x < 9; x++ )
{
src/main/java/appeng/container/slot/AppEngCraftingSlot.java
+6 -4
View File
@@ -20,11 +20,13 @@ package appeng.container.slot;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.fml.hooks.BasicEventHooks;
import net.minecraftforge.items.IItemHandler;
import appeng.util.helpers.ItemHandlerUtil;
@@ -140,10 +142,10 @@ public class AppEngCraftingSlot extends AppEngSlot
@Override
public ItemStack onTake( final PlayerEntity playerIn, final ItemStack stack )
{
net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent( playerIn, stack, new WrapperInvItemHandler( this.craftMatrix ) );
BasicEventHooks.firePlayerCraftingEvent( playerIn, stack, new WrapperInvItemHandler( this.craftMatrix ) );
this.onCrafting( stack );
net.minecraftforge.common.ForgeHooks.setCraftingPlayer( playerIn );
final InventoryCrafting ic = new InventoryCrafting( this.getContainer(), 3, 3 );
final CraftingInventory ic = new CraftingInventory( this.getContainer(), 3, 3 );
for( int x = 0; x < this.craftMatrix.getSlots(); x++ )
{
@@ -198,7 +200,7 @@ public class AppEngCraftingSlot extends AppEngSlot
}
// TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring.
protected NonNullList<ItemStack> getRemainingItems( InventoryCrafting ic, World world )
protected NonNullList<ItemStack> getRemainingItems( CraftingInventory ic, World world )
{
return CraftingManager.getRemainingItems( ic, world );
}
src/main/java/appeng/container/slot/NullSlot.java
+2 -9
View File
@@ -22,11 +22,10 @@ package appeng.container.slot;
import javax.annotation.Nonnull;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
// FIXME seems unused
public class NullSlot extends Slot
{
@@ -84,12 +83,6 @@ public class NullSlot extends Slot
return ItemStack.EMPTY;
}
@Override
public boolean isHere( final IInventory inv, final int slotIn )
{
return false;
}
@Override
public boolean canTakeStack( final PlayerEntity par1PlayerEntity )
{
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+4 -4
View File
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.List;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
@@ -160,7 +160,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
}
// TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring.
protected IRecipe findRecipe( InventoryCrafting ic, World world )
protected IRecipe findRecipe( CraftingInventory ic, World world )
{
if( this.container instanceof ContainerCraftingTerm )
{
@@ -178,7 +178,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
// TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring.
@Override
protected NonNullList<ItemStack> getRemainingItems( InventoryCrafting ic, World world )
protected NonNullList<ItemStack> getRemainingItems( CraftingInventory ic, World world )
{
if( this.container instanceof ContainerCraftingTerm )
{
@@ -213,7 +213,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
// add one of each item to the items on the board...
if( Platform.isServer() )
{
final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
final CraftingInventory ic = new CraftingInventory( new ContainerNull(), 3, 3 );
for( int x = 0; x < 9; x++ )
{
ic.setInventorySlotContents( x, this.getPattern().getStackInSlot( x ) );