Fixed Ender IO incompatibility.
This commit is contained in:
@@ -1,5 +1,8 @@
|
|||||||
# Refined Storage Changelog
|
# Refined Storage Changelog
|
||||||
|
|
||||||
|
### 1.6.8
|
||||||
|
- Fixed Ender IO incompatibility (raoulvdberge)
|
||||||
|
|
||||||
### 1.6.7
|
### 1.6.7
|
||||||
- Fixed the Raw Processor recipes not taking oredicted silicon (raoulvdberge)
|
- Fixed the Raw Processor recipes not taking oredicted silicon (raoulvdberge)
|
||||||
- Fixed the Processor Binding recipe not taking oredicted slimeballs (raoulvdberge)
|
- Fixed the Processor Binding recipe not taking oredicted slimeballs (raoulvdberge)
|
||||||
|
@@ -77,6 +77,24 @@ public interface ICraftingManager {
|
|||||||
*/
|
*/
|
||||||
ICraftingPatternChainList createPatternChainList();
|
ICraftingPatternChainList createPatternChainList();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link #request(INetworkNode, ItemStack, int)}
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
@Deprecated
|
||||||
|
default ICraftingTask request(ItemStack stack, int amount) {
|
||||||
|
return request(null, stack, amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link #request(INetworkNode, FluidStack, int)}
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
@Deprecated
|
||||||
|
default ICraftingTask request(FluidStack stack, int amount) {
|
||||||
|
return request(null, stack, amount);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Schedules a crafting task if the task isn't scheduled yet.
|
* Schedules a crafting task if the task isn't scheduled yet.
|
||||||
*
|
*
|
||||||
|
@@ -12,6 +12,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError;
|
|||||||
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
|
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
|
||||||
import com.raoulvdberge.refinedstorage.api.util.IComparer;
|
import com.raoulvdberge.refinedstorage.api.util.IComparer;
|
||||||
import com.raoulvdberge.refinedstorage.apiimpl.API;
|
import com.raoulvdberge.refinedstorage.apiimpl.API;
|
||||||
|
import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper;
|
||||||
import com.raoulvdberge.refinedstorage.tile.TileController;
|
import com.raoulvdberge.refinedstorage.tile.TileController;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
@@ -297,11 +298,21 @@ public class CraftingManager implements ICraftingManager {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void throttle(INetworkNode node) {
|
private void throttle(@Nullable INetworkNode node) {
|
||||||
throttledRequesters.put(node, MinecraftServer.getCurrentTimeMillis());
|
OneSixMigrationHelper.removalHook(); // Remove @Nullable node
|
||||||
|
|
||||||
|
if (node != null) {
|
||||||
|
throttledRequesters.put(node, MinecraftServer.getCurrentTimeMillis());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isThrottled(INetworkNode node) {
|
private boolean isThrottled(@Nullable INetworkNode node) {
|
||||||
|
OneSixMigrationHelper.removalHook(); // Remove @Nullable node
|
||||||
|
|
||||||
|
if (node == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
Long throttledSince = throttledRequesters.get(node);
|
Long throttledSince = throttledRequesters.get(node);
|
||||||
if (throttledSince == null) {
|
if (throttledSince == null) {
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user