More Renames

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
@@ -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 );
}