Add nullable to pattern inventory getter for Reborn Storage
This commit is contained in:
@@ -5,6 +5,7 @@ import net.minecraft.util.math.BlockPos;
|
|||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -32,8 +33,9 @@ public interface ICraftingPatternContainer {
|
|||||||
List<ICraftingPattern> getPatterns();
|
List<ICraftingPattern> getPatterns();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the pattern inventory
|
* @return the pattern inventory, or null if no pattern is present
|
||||||
*/
|
*/
|
||||||
|
@Nullable
|
||||||
IItemHandlerModifiable getPatternInventory();
|
IItemHandlerModifiable getPatternInventory();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -302,11 +302,11 @@ public class CraftingManager implements ICraftingManager {
|
|||||||
|
|
||||||
patterns.addAll(container.getPatterns());
|
patterns.addAll(container.getPatterns());
|
||||||
|
|
||||||
if (!containerInventories.containsKey(container.getName())) {
|
IItemHandlerModifiable handler = container.getPatternInventory();
|
||||||
containerInventories.put(container.getName(), new ArrayList<>());
|
|
||||||
}
|
|
||||||
|
|
||||||
containerInventories.get(container.getName()).add(container.getPatternInventory());
|
if (handler != null) {
|
||||||
|
containerInventories.computeIfAbsent(container.getName(), k -> new ArrayList<>()).add(handler);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Nullable
|
||||||
public IItemHandlerModifiable getPatternInventory() {
|
public IItemHandlerModifiable getPatternInventory() {
|
||||||
return patterns;
|
return patterns;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user