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

More moves and compilation fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-29 02:15:31 +02:00
parent 3df93fc66d
commit 0d63f560d3
240 changed files with 2221 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/slot/AppEngCraftingSlot.java
+4 -4
View File
@@ -23,7 +23,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.RecipeType;
import net.minecraft.util.NonNullList;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.world.World;
import net.minecraftforge.fml.hooks.BasicEventHooks;
@@ -96,7 +96,7 @@ public class AppEngCraftingSlot extends AppEngSlot {
ic.setStack(x, this.craftMatrix.getInvStack(x));
}
final NonNullList<ItemStack> aitemstack = this.getRemainingItems(ic, playerIn.world);
final DefaultedList<ItemStack> aitemstack = this.getRemainingItems(ic, playerIn.world);
ItemHandlerUtil.copy(ic, this.craftMatrix, false);
@@ -137,9 +137,9 @@ 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(CraftingInventory ic, World world) {
protected DefaultedList<ItemStack> getRemainingItems(CraftingInventory ic, World world) {
return world.getRecipeManager().getRecipe(RecipeType.CRAFTING, ic, world)
.map(iCraftingRecipe -> iCraftingRecipe.getRemainingItems(ic))
.orElse(NonNullList.withSize(9, ItemStack.EMPTY));
.orElse(DefaultedList.withSize(9, ItemStack.EMPTY));
}
}
src/main/java/appeng/container/slot/CraftingTermSlot.java
+4 -4
View File
@@ -29,7 +29,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Recipe;
import net.minecraft.recipe.RecipeType;
import net.minecraft.util.NonNullList;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -139,7 +139,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot {
final List<ItemStack> drops = new ArrayList<>();
drops.add(extra);
Platform.spawnDrops(who.world,
new BlockPos((int) who.getX(), (int) who.getY(), (int) who.getPosZ()), drops);
new BlockPos((int) who.getX(), (int) who.getY(), (int) who.getZ()), drops);
return;
}
}
@@ -164,7 +164,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot {
// TODO: This is really hacky and NEEDS to be solved with a full container/gui
// refactoring.
@Override
protected NonNullList<ItemStack> getRemainingItems(CraftingInventory ic, World world) {
protected DefaultedList<ItemStack> getRemainingItems(CraftingInventory ic, World world) {
if (this.container instanceof CraftingTermContainer) {
final CraftingTermContainer containerTerminal = (CraftingTermContainer) this.container;
final Recipe<CraftingInventory> recipe = containerTerminal.getCurrentRecipe();
@@ -282,7 +282,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot {
}
if (drops.size() > 0) {
Platform.spawnDrops(p.world, new BlockPos((int) p.getX(), (int) p.getY(), (int) p.getPosZ()), drops);
Platform.spawnDrops(p.world, new BlockPos((int) p.getX(), (int) p.getY(), (int) p.getZ()), drops);
}
}