Add nullable to pattern inventory getter for Reborn Storage

This commit is contained in:
raoulvdberge
2018-03-19 16:33:03 +01:00
parent 20c96b467f
commit f287172ce9
3 changed files with 8 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import javax.annotation.Nullable;
import java.util.List;
/**
@@ -32,8 +33,9 @@ public interface ICraftingPatternContainer {
List<ICraftingPattern> getPatterns();
/**
* @return the pattern inventory
* @return the pattern inventory, or null if no pattern is present
*/
@Nullable
IItemHandlerModifiable getPatternInventory();
/**

View File

@@ -302,11 +302,11 @@ public class CraftingManager implements ICraftingManager {
patterns.addAll(container.getPatterns());
if (!containerInventories.containsKey(container.getName())) {
containerInventories.put(container.getName(), new ArrayList<>());
}
IItemHandlerModifiable handler = container.getPatternInventory();
containerInventories.get(container.getName()).add(container.getPatternInventory());
if (handler != null) {
containerInventories.computeIfAbsent(container.getName(), k -> new ArrayList<>()).add(handler);
}
}
}

View File

@@ -162,6 +162,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
}
@Override
@Nullable
public IItemHandlerModifiable getPatternInventory() {
return patterns;
}