Removed the Interdimensional Upgrade. Removed the FE/t cost per block in the Network Transmitter.

This commit is contained in:
raoulvdberge
2018-11-19 21:22:01 +01:00
parent a45f5d6c08
commit 60ada318d4
22 changed files with 13 additions and 101 deletions

View File

@@ -15,6 +15,8 @@
- Fixed another duplication bug with a disconnected Crafting Grid (raoulvdberge) - Fixed another duplication bug with a disconnected Crafting Grid (raoulvdberge)
- Fixed oredict mode in autocrafting not working at all (raoulvdberge) - Fixed oredict mode in autocrafting not working at all (raoulvdberge)
- Removed getMissingItems() and getMissingFluids() functions from the OpenComputers integration, that info is now accessible through schedule(Fluid)Task(). If you just want to check if there are missing items/fluids but don't want to start an actual task, use the "canSchedule" parameter (raoulvdberge) - Removed getMissingItems() and getMissingFluids() functions from the OpenComputers integration, that info is now accessible through schedule(Fluid)Task(). If you just want to check if there are missing items/fluids but don't want to start an actual task, use the "canSchedule" parameter (raoulvdberge)
- Removed the Interdimensional Upgrade, Network Transmitters are now cross dimensional by default (raoulvdberge)
- Removed the per block FE cost of the Network Transmitter, it draws a fixed amount of FE/t now (raoulvdberge)
- Updated Russian translation (kellixon) - Updated Russian translation (kellixon)
- Added fluid functions for the fluid autocrafting to the OpenComputers integration (raoulvdberge) - Added fluid functions for the fluid autocrafting to the OpenComputers integration (raoulvdberge)

View File

@@ -44,7 +44,6 @@ public class RSConfig {
public int patternGridUsage; public int patternGridUsage;
public int fluidGridUsage; public int fluidGridUsage;
public int networkTransmitterUsage; public int networkTransmitterUsage;
public float networkTransmitterPerBlockUsage;
public int networkReceiverUsage; public int networkReceiverUsage;
public int diskManipulatorUsage; public int diskManipulatorUsage;
public int securityManagerUsage; public int securityManagerUsage;
@@ -104,7 +103,6 @@ public class RSConfig {
public int speedUpgradeUsage; public int speedUpgradeUsage;
public int craftingUpgradeUsage; public int craftingUpgradeUsage;
public int stackUpgradeUsage; public int stackUpgradeUsage;
public int interdimensionalUpgradeUsage;
public int silkTouchUpgradeUsage; public int silkTouchUpgradeUsage;
public int fortuneUpgradeUsagePerFortune; public int fortuneUpgradeUsagePerFortune;
//endregion //endregion
@@ -195,8 +193,7 @@ public class RSConfig {
craftingGridUsage = config.getInt("craftingGrid", ENERGY, 4, 0, Integer.MAX_VALUE, "The energy used by Crafting Grids"); craftingGridUsage = config.getInt("craftingGrid", ENERGY, 4, 0, Integer.MAX_VALUE, "The energy used by Crafting Grids");
patternGridUsage = config.getInt("patternGrid", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Pattern Grids"); patternGridUsage = config.getInt("patternGrid", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Pattern Grids");
fluidGridUsage = config.getInt("fluidGrid", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids"); fluidGridUsage = config.getInt("fluidGrid", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids");
networkTransmitterUsage = config.getInt("networkTransmitter", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters"); networkTransmitterUsage = config.getInt("networkTransmitter", ENERGY, 64, 0, Integer.MAX_VALUE, "The energy used by Network Transmitters");
networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", ENERGY, 1, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up");
networkReceiverUsage = config.getInt("networkReceiver", ENERGY, 0, 0, Integer.MAX_VALUE, "The energy used by Network Receivers"); networkReceiverUsage = config.getInt("networkReceiver", ENERGY, 0, 0, Integer.MAX_VALUE, "The energy used by Network Receivers");
diskManipulatorUsage = config.getInt("diskManipulator", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators"); diskManipulatorUsage = config.getInt("diskManipulator", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators");
securityManagerUsage = config.getInt("securityManager", ENERGY, 4, 0, Integer.MAX_VALUE, "The base energy used by Security Managers"); securityManagerUsage = config.getInt("securityManager", ENERGY, 4, 0, Integer.MAX_VALUE, "The base energy used by Security Managers");
@@ -256,7 +253,6 @@ public class RSConfig {
speedUpgradeUsage = config.getInt("speed", UPGRADES, 2, 0, Integer.MAX_VALUE, "The additional energy used per Speed Upgrade"); speedUpgradeUsage = config.getInt("speed", UPGRADES, 2, 0, Integer.MAX_VALUE, "The additional energy used per Speed Upgrade");
craftingUpgradeUsage = config.getInt("crafting", UPGRADES, 5, 0, Integer.MAX_VALUE, "The additional energy used per Crafting Upgrade"); craftingUpgradeUsage = config.getInt("crafting", UPGRADES, 5, 0, Integer.MAX_VALUE, "The additional energy used per Crafting Upgrade");
stackUpgradeUsage = config.getInt("stack", UPGRADES, 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade"); stackUpgradeUsage = config.getInt("stack", UPGRADES, 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade");
interdimensionalUpgradeUsage = config.getInt("interdimensional", UPGRADES, 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade");
silkTouchUpgradeUsage = config.getInt("silkTouch", UPGRADES, 15, 0, Integer.MAX_VALUE, "The additional energy used by the Silk Touch Upgrade"); silkTouchUpgradeUsage = config.getInt("silkTouch", UPGRADES, 15, 0, Integer.MAX_VALUE, "The additional energy used by the Silk Touch Upgrade");
fortuneUpgradeUsagePerFortune = config.getInt("fortune", UPGRADES, 10, 0, Integer.MAX_VALUE, "The additional energy used by the Fortune Upgrade, multiplied by the level of the enchantment"); fortuneUpgradeUsagePerFortune = config.getInt("fortune", UPGRADES, 10, 0, Integer.MAX_VALUE, "The additional energy used by the Fortune Upgrade, multiplied by the level of the enchantment");
//endregion //endregion

View File

@@ -23,6 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.UUID; import java.util.UUID;
// TODO: getId: return a ResourceLocation.
public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
private static final String NBT_OWNER = "Owner"; private static final String NBT_OWNER = "Owner";
private static final String NBT_DIRECTION = "Direction"; private static final String NBT_DIRECTION = "Direction";

View File

@@ -4,11 +4,9 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.Action;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemNetworkCard; import com.raoulvdberge.refinedstorage.item.ItemNetworkCard;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@@ -16,24 +14,12 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class NetworkNodeNetworkTransmitter extends NetworkNode { public class NetworkNodeNetworkTransmitter extends NetworkNode {
public static final String ID = "network_transmitter"; public static final String ID = "network_transmitter";
private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(1, new ListenerNetworkNode(this), ItemUpgrade.TYPE_INTERDIMENSIONAL) {
@Override
protected void onContentsChanged(int slot) {
super.onContentsChanged(slot);
if (network != null) {
network.getNodeGraph().invalidate(Action.PERFORM, network.world(), network.getPosition());
}
}
};
private ItemHandlerBase networkCard = new ItemHandlerBase(1, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.NETWORK_CARD)) { private ItemHandlerBase networkCard = new ItemHandlerBase(1, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.NETWORK_CARD)) {
@Override @Override
protected void onContentsChanged(int slot) { protected void onContentsChanged(int slot) {
@@ -66,7 +52,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
super.write(tag); super.write(tag);
StackUtils.writeItems(networkCard, 0, tag); StackUtils.writeItems(networkCard, 0, tag);
StackUtils.writeItems(upgrades, 1, tag);
return tag; return tag;
} }
@@ -76,7 +61,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
super.read(tag); super.read(tag);
StackUtils.readItems(networkCard, 0, tag); StackUtils.readItems(networkCard, 0, tag);
StackUtils.readItems(upgrades, 1, tag);
} }
@Override @Override
@@ -86,23 +70,16 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
@Override @Override
public int getEnergyUsage() { public int getEnergyUsage() {
return Math.min( return RS.INSTANCE.config.networkTransmitterUsage;
RS.INSTANCE.config.interdimensionalUpgradeUsage,
RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage()
);
} }
public ItemHandlerBase getNetworkCard() { public ItemHandlerBase getNetworkCard() {
return networkCard; return networkCard;
} }
public ItemHandlerUpgrade getUpgrades() {
return upgrades;
}
@Override @Override
public IItemHandler getDrops() { public IItemHandler getDrops() {
return new CombinedInvWrapper(networkCard, upgrades); return networkCard;
} }
@Nullable @Nullable
@@ -126,12 +103,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
return world.provider.getDimension() == receiverDimension; return world.provider.getDimension() == receiverDimension;
} }
public boolean isDimensionSupported() {
return isSameDimension() || upgrades.hasUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL);
}
private boolean canTransmit() { private boolean canTransmit() {
return canUpdate() && receiver != null && isDimensionSupported(); return canUpdate() && receiver != null;
} }
@Override @Override
@@ -151,6 +124,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
if (canTransmit()) { if (canTransmit()) {
if (!isSameDimension()) { if (!isSameDimension()) {
final World dimensionWorld = DimensionManager.getWorld(receiverDimension); final World dimensionWorld = DimensionManager.getWorld(receiverDimension);
if (dimensionWorld != null) { if (dimensionWorld != null) {
operator.apply(dimensionWorld, receiver, null); operator.apply(dimensionWorld, receiver, null);
} }

View File

@@ -10,11 +10,8 @@ public class ContainerNetworkTransmitter extends ContainerBase {
addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20)); addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20));
addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getUpgrades(), 0, 187, 6));
addPlayerInventory(8, 55); addPlayerInventory(8, 55);
transferManager.addBiTransfer(player.inventory, networkTransmitter.getNode().getUpgrades());
transferManager.addBiTransfer(player.inventory, networkTransmitter.getNode().getNetworkCard()); transferManager.addBiTransfer(player.inventory, networkTransmitter.getNode().getNetworkCard());
} }
} }

View File

@@ -8,7 +8,7 @@ public class GuiNetworkTransmitter extends GuiBase {
private TileNetworkTransmitter networkTransmitter; private TileNetworkTransmitter networkTransmitter;
public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) { public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) {
super(container, 210, 137); super(container, 176, 137);
this.networkTransmitter = networkTransmitter; this.networkTransmitter = networkTransmitter;
} }
@@ -37,8 +37,6 @@ public class GuiNetworkTransmitter extends GuiBase {
if (networkTransmitter.getNode().getNetworkCard().getStackInSlot(0).isEmpty()) { if (networkTransmitter.getNode().getNetworkCard().getStackInSlot(0).isEmpty()) {
distance = t("gui.refinedstorage:network_transmitter.missing_card"); distance = t("gui.refinedstorage:network_transmitter.missing_card");
} else if (!TileNetworkTransmitter.RECEIVER_DIMENSION_SUPPORTED.getValue()) {
distance = t("gui.refinedstorage:network_transmitter.missing_upgrade");
} else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) { } else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) {
distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue()); distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue());
} else if (TileNetworkTransmitter.DISTANCE.getValue() != -1) { } else if (TileNetworkTransmitter.DISTANCE.getValue() != -1) {

View File

@@ -22,7 +22,6 @@ public class ItemUpgrade extends ItemBase {
public static final int TYPE_SPEED = 2; public static final int TYPE_SPEED = 2;
public static final int TYPE_CRAFTING = 3; public static final int TYPE_CRAFTING = 3;
public static final int TYPE_STACK = 4; public static final int TYPE_STACK = 4;
public static final int TYPE_INTERDIMENSIONAL = 5;
public static final int TYPE_SILK_TOUCH = 6; public static final int TYPE_SILK_TOUCH = 6;
public static final int TYPE_FORTUNE_1 = 7; public static final int TYPE_FORTUNE_1 = 7;
public static final int TYPE_FORTUNE_2 = 8; public static final int TYPE_FORTUNE_2 = 8;
@@ -44,7 +43,6 @@ public class ItemUpgrade extends ItemBase {
new ResourceLocation(RS.ID, "range_upgrade"), new ResourceLocation(RS.ID, "range_upgrade"),
new ResourceLocation(RS.ID, "speed_upgrade"), new ResourceLocation(RS.ID, "speed_upgrade"),
new ResourceLocation(RS.ID, "stack_upgrade"), new ResourceLocation(RS.ID, "stack_upgrade"),
new ResourceLocation(RS.ID, "interdimensional_upgrade"),
new ResourceLocation(RS.ID, "silk_touch_upgrade"), new ResourceLocation(RS.ID, "silk_touch_upgrade"),
new ResourceLocation(RS.ID, "fortune_upgrade") new ResourceLocation(RS.ID, "fortune_upgrade")
); );
@@ -54,7 +52,6 @@ public class ItemUpgrade extends ItemBase {
modelRegistration.setModel(this, TYPE_SPEED, new ModelResourceLocation(RS.ID + ":speed_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_SPEED, new ModelResourceLocation(RS.ID + ":speed_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_CRAFTING, new ModelResourceLocation(RS.ID + ":crafting_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_CRAFTING, new ModelResourceLocation(RS.ID + ":crafting_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_STACK, new ModelResourceLocation(RS.ID + ":stack_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_STACK, new ModelResourceLocation(RS.ID + ":stack_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_INTERDIMENSIONAL, new ModelResourceLocation(RS.ID + ":interdimensional_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_SILK_TOUCH, new ModelResourceLocation(RS.ID + ":silk_touch_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_SILK_TOUCH, new ModelResourceLocation(RS.ID + ":silk_touch_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_FORTUNE_1, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_FORTUNE_1, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory"));
modelRegistration.setModel(this, TYPE_FORTUNE_2, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_FORTUNE_2, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory"));
@@ -82,9 +79,11 @@ public class ItemUpgrade extends ItemBase {
} }
for (int i = 0; i <= 9; ++i) { for (int i = 0; i <= 9; ++i) {
if (i != 5) { // Removal of interdimensional upgrade
items.add(new ItemStack(this, 1, i)); items.add(new ItemStack(this, 1, i));
} }
} }
}
public static int getFortuneLevel(@Nullable ItemStack stack) { public static int getFortuneLevel(@Nullable ItemStack stack) {
if (stack != null) { if (stack != null) {
@@ -110,8 +109,6 @@ public class ItemUpgrade extends ItemBase {
return RS.INSTANCE.config.craftingUpgradeUsage; return RS.INSTANCE.config.craftingUpgradeUsage;
case TYPE_STACK: case TYPE_STACK:
return RS.INSTANCE.config.stackUpgradeUsage; return RS.INSTANCE.config.stackUpgradeUsage;
case TYPE_INTERDIMENSIONAL:
return RS.INSTANCE.config.interdimensionalUpgradeUsage;
case TYPE_SILK_TOUCH: case TYPE_SILK_TOUCH:
return RS.INSTANCE.config.silkTouchUpgradeUsage; return RS.INSTANCE.config.silkTouchUpgradeUsage;
case TYPE_FORTUNE_1: case TYPE_FORTUNE_1:

View File

@@ -71,6 +71,7 @@ import java.util.function.Predicate;
import static com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY; import static com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY;
// TODO: Change INetwork to be offloaded from the tile.
public class TileController extends TileBase implements ITickable, INetwork, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController>, INetworkNodeVisitor { public class TileController extends TileBase implements ITickable, INetwork, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController>, INetworkNodeVisitor {
private static final Comparator<ClientNode> CLIENT_NODE_COMPARATOR = (left, right) -> { private static final Comparator<ClientNode> CLIENT_NODE_COMPARATOR = (left, right) -> {
if (left.getEnergyUsage() == right.getEnergyUsage()) { if (left.getEnergyUsage() == right.getEnergyUsage()) {

View File

@@ -19,12 +19,10 @@ public class TileNetworkTransmitter extends TileNode<NetworkNodeNetworkTransmitt
return (transmitter.getReceiver() != null && transmitter.isSameDimension()) ? transmitter.getDistance() : -1; return (transmitter.getReceiver() != null && transmitter.isSameDimension()) ? transmitter.getDistance() : -1;
}); });
public static final TileDataParameter<Integer, TileNetworkTransmitter> RECEIVER_DIMENSION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getReceiverDimension()); public static final TileDataParameter<Integer, TileNetworkTransmitter> RECEIVER_DIMENSION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getReceiverDimension());
public static final TileDataParameter<Boolean, TileNetworkTransmitter> RECEIVER_DIMENSION_SUPPORTED = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isDimensionSupported());
public TileNetworkTransmitter() { public TileNetworkTransmitter() {
dataManager.addWatchedParameter(DISTANCE); dataManager.addWatchedParameter(DISTANCE);
dataManager.addWatchedParameter(RECEIVER_DIMENSION); dataManager.addWatchedParameter(RECEIVER_DIMENSION);
dataManager.addWatchedParameter(RECEIVER_DIMENSION_SUPPORTED);
} }
@Override @Override

View File

@@ -43,7 +43,6 @@ gui.refinedstorage:network_transmitter=Netzwerksender
gui.refinedstorage:network_transmitter.distance=%d Blöcke gui.refinedstorage:network_transmitter.distance=%d Blöcke
gui.refinedstorage:network_transmitter.dimension=Dimension %d gui.refinedstorage:network_transmitter.dimension=Dimension %d
gui.refinedstorage:network_transmitter.missing_card=Fehlende Netzwerk Karte gui.refinedstorage:network_transmitter.missing_card=Fehlende Netzwerk Karte
gui.refinedstorage:network_transmitter.missing_upgrade=Upgrade einfügen
gui.refinedstorage:fluid_interface=Flüssigkeitsschnittstelle gui.refinedstorage:fluid_interface=Flüssigkeitsschnittstelle
gui.refinedstorage:fluid_interface.in=Ein gui.refinedstorage:fluid_interface.in=Ein
gui.refinedstorage:fluid_interface.out=Aus gui.refinedstorage:fluid_interface.out=Aus
@@ -270,7 +269,6 @@ item.refinedstorage:upgrade.1.name=Reichweitenupgrade
item.refinedstorage:upgrade.2.name=Geschwindigkeitsupgrade item.refinedstorage:upgrade.2.name=Geschwindigkeitsupgrade
item.refinedstorage:upgrade.3.name=Fertigungsupgrade item.refinedstorage:upgrade.3.name=Fertigungsupgrade
item.refinedstorage:upgrade.4.name=Stapelupgrade item.refinedstorage:upgrade.4.name=Stapelupgrade
item.refinedstorage:upgrade.5.name=Interdimensionles Upgrade
item.refinedstorage:upgrade.6.name=Behutsamkeitsupgrade item.refinedstorage:upgrade.6.name=Behutsamkeitsupgrade
item.refinedstorage:upgrade.7.name=Glücksupgrade item.refinedstorage:upgrade.7.name=Glücksupgrade
item.refinedstorage:upgrade.8.name=Glücksupgrade item.refinedstorage:upgrade.8.name=Glücksupgrade

View File

@@ -48,7 +48,6 @@ gui.refinedstorage:network_transmitter=Network Transmitter
gui.refinedstorage:network_transmitter.distance=%d block(s) gui.refinedstorage:network_transmitter.distance=%d block(s)
gui.refinedstorage:network_transmitter.dimension=Dimension %d gui.refinedstorage:network_transmitter.dimension=Dimension %d
gui.refinedstorage:network_transmitter.missing_card=Missing Network Card gui.refinedstorage:network_transmitter.missing_card=Missing Network Card
gui.refinedstorage:network_transmitter.missing_upgrade=Insert upgrade
gui.refinedstorage:fluid_interface=Fluid Interface gui.refinedstorage:fluid_interface=Fluid Interface
gui.refinedstorage:fluid_interface.in=In gui.refinedstorage:fluid_interface.in=In
gui.refinedstorage:fluid_interface.out=Out gui.refinedstorage:fluid_interface.out=Out
@@ -284,7 +283,6 @@ item.refinedstorage:upgrade.1.name=Range Upgrade
item.refinedstorage:upgrade.2.name=Speed Upgrade item.refinedstorage:upgrade.2.name=Speed Upgrade
item.refinedstorage:upgrade.3.name=Crafting Upgrade item.refinedstorage:upgrade.3.name=Crafting Upgrade
item.refinedstorage:upgrade.4.name=Stack Upgrade item.refinedstorage:upgrade.4.name=Stack Upgrade
item.refinedstorage:upgrade.5.name=Interdimensional Upgrade
item.refinedstorage:upgrade.6.name=Silk Touch Upgrade item.refinedstorage:upgrade.6.name=Silk Touch Upgrade
item.refinedstorage:upgrade.7.name=Fortune Upgrade item.refinedstorage:upgrade.7.name=Fortune Upgrade
item.refinedstorage:upgrade.8.name=Fortune Upgrade item.refinedstorage:upgrade.8.name=Fortune Upgrade

View File

@@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter=Emisor de Red
gui.refinedstorage:network_transmitter.distance=%d bloque(s) gui.refinedstorage:network_transmitter.distance=%d bloque(s)
gui.refinedstorage:network_transmitter.dimension=Dimensión %d gui.refinedstorage:network_transmitter.dimension=Dimensión %d
gui.refinedstorage:network_transmitter.missing_card=Falta Tarjeta de Red gui.refinedstorage:network_transmitter.missing_card=Falta Tarjeta de Red
gui.refinedstorage:network_transmitter.missing_upgrade=Inserta Mejora
gui.refinedstorage:fluid_interface=Interfaz de Fluidos gui.refinedstorage:fluid_interface=Interfaz de Fluidos
gui.refinedstorage:fluid_interface.in=Entrada gui.refinedstorage:fluid_interface.in=Entrada
gui.refinedstorage:fluid_interface.out=Salida gui.refinedstorage:fluid_interface.out=Salida
@@ -259,7 +258,6 @@ item.refinedstorage:upgrade.1.name=Mejora de Rango
item.refinedstorage:upgrade.2.name=Mejora de Rapidez item.refinedstorage:upgrade.2.name=Mejora de Rapidez
item.refinedstorage:upgrade.3.name=Mejora de Fabricación item.refinedstorage:upgrade.3.name=Mejora de Fabricación
item.refinedstorage:upgrade.4.name=Mejora de Apilación item.refinedstorage:upgrade.4.name=Mejora de Apilación
item.refinedstorage:upgrade.5.name=Mejora Interdimensional
item.refinedstorage:upgrade.6.name=Mejora de Toque de Seda item.refinedstorage:upgrade.6.name=Mejora de Toque de Seda
item.refinedstorage:upgrade.7.name=Mejora de Fortuna item.refinedstorage:upgrade.7.name=Mejora de Fortuna
item.refinedstorage:upgrade.8.name=Mejora de Fortuna item.refinedstorage:upgrade.8.name=Mejora de Fortuna

View File

@@ -35,7 +35,6 @@ gui.refinedstorage:network_transmitter=Emetteur réseau
gui.refinedstorage:network_transmitter.distance=%d bloc(s) gui.refinedstorage:network_transmitter.distance=%d bloc(s)
gui.refinedstorage:network_transmitter.dimension=Dimension %d gui.refinedstorage:network_transmitter.dimension=Dimension %d
gui.refinedstorage:network_transmitter.missing_card=Carte réseau manquante gui.refinedstorage:network_transmitter.missing_card=Carte réseau manquante
gui.refinedstorage:network_transmitter.missing_upgrade=Insérer une amélioration
gui.refinedstorage:fluid_interface=Interface de fluides gui.refinedstorage:fluid_interface=Interface de fluides
gui.refinedstorage:fluid_interface.in=Entrée gui.refinedstorage:fluid_interface.in=Entrée
gui.refinedstorage:fluid_interface.out=Sortie gui.refinedstorage:fluid_interface.out=Sortie
@@ -236,7 +235,6 @@ item.refinedstorage:upgrade.1.name=Amélioration de portée
item.refinedstorage:upgrade.2.name=Amélioration de vitesse item.refinedstorage:upgrade.2.name=Amélioration de vitesse
item.refinedstorage:upgrade.3.name=Amélioration de craft item.refinedstorage:upgrade.3.name=Amélioration de craft
item.refinedstorage:upgrade.4.name=Amélioration de stack item.refinedstorage:upgrade.4.name=Amélioration de stack
item.refinedstorage:upgrade.5.name=Amélioration interdimensionnelle
item.refinedstorage:upgrade.6.name=Amélioration Touché de soie item.refinedstorage:upgrade.6.name=Amélioration Touché de soie
item.refinedstorage:upgrade.7.name=Amélioration Fortune item.refinedstorage:upgrade.7.name=Amélioration Fortune
item.refinedstorage:storage_housing.name=Boitier de stockage item.refinedstorage:storage_housing.name=Boitier de stockage

View File

@@ -34,7 +34,6 @@ gui.refinedstorage:network_transmitter=네트워크 송신기
gui.refinedstorage:network_transmitter.distance=%d블럭 gui.refinedstorage:network_transmitter.distance=%d블럭
gui.refinedstorage:network_transmitter.dimension=월드: %d gui.refinedstorage:network_transmitter.dimension=월드: %d
gui.refinedstorage:network_transmitter.missing_card=부족한 네트워크 카드 gui.refinedstorage:network_transmitter.missing_card=부족한 네트워크 카드
gui.refinedstorage:network_transmitter.missing_upgrade=업그레이드를 넣으세요.
gui.refinedstorage:fluid_interface=액체 인터페이스 gui.refinedstorage:fluid_interface=액체 인터페이스
gui.refinedstorage:fluid_interface.in=입력 gui.refinedstorage:fluid_interface.in=입력
gui.refinedstorage:fluid_interface.out=출력 gui.refinedstorage:fluid_interface.out=출력
@@ -234,7 +233,6 @@ item.refinedstorage:upgrade.1.name=범위 업그레이드
item.refinedstorage:upgrade.2.name=속도 업그레이드 item.refinedstorage:upgrade.2.name=속도 업그레이드
item.refinedstorage:upgrade.3.name=제작 업그레이드 item.refinedstorage:upgrade.3.name=제작 업그레이드
item.refinedstorage:upgrade.4.name=세트 업그레이드 item.refinedstorage:upgrade.4.name=세트 업그레이드
item.refinedstorage:upgrade.5.name=다중 월드 업그레이드
item.refinedstorage:upgrade.6.name=섬세한 손길 업그레이드 item.refinedstorage:upgrade.6.name=섬세한 손길 업그레이드
item.refinedstorage:upgrade.7.name=행운 업그레이드 item.refinedstorage:upgrade.7.name=행운 업그레이드
item.refinedstorage:storage_housing.name=빈 저장 디스크 item.refinedstorage:storage_housing.name=빈 저장 디스크

View File

@@ -29,7 +29,6 @@ gui.refinedstorage:network_transmitter=Netwerkzender
gui.refinedstorage:network_transmitter.distance=%d blokken gui.refinedstorage:network_transmitter.distance=%d blokken
gui.refinedstorage:network_transmitter.dimension=Dimensie %d gui.refinedstorage:network_transmitter.dimension=Dimensie %d
gui.refinedstorage:network_transmitter.missing_card=Geen Netwerkkaart gui.refinedstorage:network_transmitter.missing_card=Geen Netwerkkaart
gui.refinedstorage:network_transmitter.missing_upgrade=Ontbrekende upgrade
gui.refinedstorage:fluid_interface=Vloeistof Interface gui.refinedstorage:fluid_interface=Vloeistof Interface
gui.refinedstorage:fluid_interface.in=In gui.refinedstorage:fluid_interface.in=In
gui.refinedstorage:fluid_interface.out=Uit gui.refinedstorage:fluid_interface.out=Uit
@@ -174,7 +173,6 @@ item.refinedstorage:upgrade.1.name=Afstand Upgrade
item.refinedstorage:upgrade.2.name=Snelheid Upgrade item.refinedstorage:upgrade.2.name=Snelheid Upgrade
item.refinedstorage:upgrade.3.name=Crafting Upgrade item.refinedstorage:upgrade.3.name=Crafting Upgrade
item.refinedstorage:upgrade.4.name=Stack Upgrade item.refinedstorage:upgrade.4.name=Stack Upgrade
item.refinedstorage:upgrade.5.name=Interdimensionale Upgrade
item.refinedstorage:storage_housing.name=Opslagomhulsel item.refinedstorage:storage_housing.name=Opslagomhulsel
item.refinedstorage:filter.name=Filter item.refinedstorage:filter.name=Filter
item.refinedstorage:network_card.name=Netwerk Kaart item.refinedstorage:network_card.name=Netwerk Kaart

View File

@@ -35,7 +35,6 @@ gui.refinedstorage:network_transmitter=Transmissor de Rede
gui.refinedstorage:network_transmitter.distance=%d Blocos gui.refinedstorage:network_transmitter.distance=%d Blocos
gui.refinedstorage:network_transmitter.dimension=Dimensão %d gui.refinedstorage:network_transmitter.dimension=Dimensão %d
gui.refinedstorage:network_transmitter.missing_card=Ausência de Cartão de Rede gui.refinedstorage:network_transmitter.missing_card=Ausência de Cartão de Rede
gui.refinedstorage:network_transmitter.missing_upgrade=Inserir Aprimoramento
gui.refinedstorage:fluid_interface=Interface de Fluidos gui.refinedstorage:fluid_interface=Interface de Fluidos
gui.refinedstorage:fluid_interface.in=Entrada gui.refinedstorage:fluid_interface.in=Entrada
gui.refinedstorage:fluid_interface.out=Saída gui.refinedstorage:fluid_interface.out=Saída
@@ -237,7 +236,6 @@ item.refinedstorage:upgrade.1.name=Aprimoramento de Alcance
item.refinedstorage:upgrade.2.name=Aprimoramento de Velocidade item.refinedstorage:upgrade.2.name=Aprimoramento de Velocidade
item.refinedstorage:upgrade.3.name=Aprimoramento de Fabricação item.refinedstorage:upgrade.3.name=Aprimoramento de Fabricação
item.refinedstorage:upgrade.4.name=Aprimoramento de Pilha item.refinedstorage:upgrade.4.name=Aprimoramento de Pilha
item.refinedstorage:upgrade.5.name=Aprimoramento Interdimensional
item.refinedstorage:upgrade.6.name=Aprimoramento de Toque Suave item.refinedstorage:upgrade.6.name=Aprimoramento de Toque Suave
item.refinedstorage:upgrade.7.name=Aprimoramento de Fortuna item.refinedstorage:upgrade.7.name=Aprimoramento de Fortuna
item.refinedstorage:upgrade.8.name=Aprimoramento de Fortuna item.refinedstorage:upgrade.8.name=Aprimoramento de Fortuna

View File

@@ -48,7 +48,6 @@ gui.refinedstorage:network_transmitter=Сетевой передатчик
gui.refinedstorage:network_transmitter.distance=%d блоков gui.refinedstorage:network_transmitter.distance=%d блоков
gui.refinedstorage:network_transmitter.dimension=Измерение %d gui.refinedstorage:network_transmitter.dimension=Измерение %d
gui.refinedstorage:network_transmitter.missing_card=Не найдена сетевая карта gui.refinedstorage:network_transmitter.missing_card=Не найдена сетевая карта
gui.refinedstorage:network_transmitter.missing_upgrade=Вставьте улучшение
gui.refinedstorage:fluid_interface=Жидкостный интерфейс gui.refinedstorage:fluid_interface=Жидкостный интерфейс
gui.refinedstorage:fluid_interface.in=В gui.refinedstorage:fluid_interface.in=В
gui.refinedstorage:fluid_interface.out=Из gui.refinedstorage:fluid_interface.out=Из
@@ -285,7 +284,6 @@ item.refinedstorage:upgrade.1.name=Улучшение: "Радиус"
item.refinedstorage:upgrade.2.name=Улучшение: "Скорость" item.refinedstorage:upgrade.2.name=Улучшение: "Скорость"
item.refinedstorage:upgrade.3.name=Улучшение: "Крафт" item.refinedstorage:upgrade.3.name=Улучшение: "Крафт"
item.refinedstorage:upgrade.4.name=Улучшение: "Стак" item.refinedstorage:upgrade.4.name=Улучшение: "Стак"
item.refinedstorage:upgrade.5.name=Улучшение: "Измерение"
item.refinedstorage:upgrade.6.name=Улучшение: "Шёлковое касание" item.refinedstorage:upgrade.6.name=Улучшение: "Шёлковое касание"
item.refinedstorage:upgrade.7.name=Улучшение: "Удача" item.refinedstorage:upgrade.7.name=Улучшение: "Удача"
item.refinedstorage:upgrade.8.name=Улучшение: "Удача" item.refinedstorage:upgrade.8.name=Улучшение: "Удача"

View File

@@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter=网络变送器
gui.refinedstorage:network_transmitter.distance=%d 个方块 gui.refinedstorage:network_transmitter.distance=%d 个方块
gui.refinedstorage:network_transmitter.dimension=维度 %d gui.refinedstorage:network_transmitter.dimension=维度 %d
gui.refinedstorage:network_transmitter.missing_card=缺失网卡 gui.refinedstorage:network_transmitter.missing_card=缺失网卡
gui.refinedstorage:network_transmitter.missing_upgrade=缺失插入升级
gui.refinedstorage:fluid_interface=流体面板 gui.refinedstorage:fluid_interface=流体面板
gui.refinedstorage:fluid_interface.in=输入 gui.refinedstorage:fluid_interface.in=输入
gui.refinedstorage:fluid_interface.out=输出 gui.refinedstorage:fluid_interface.out=输出
@@ -238,7 +237,6 @@ item.refinedstorage:upgrade.1.name=范围升级
item.refinedstorage:upgrade.2.name=速度升级 item.refinedstorage:upgrade.2.name=速度升级
item.refinedstorage:upgrade.3.name=合成升级 item.refinedstorage:upgrade.3.name=合成升级
item.refinedstorage:upgrade.4.name=堆叠升级 item.refinedstorage:upgrade.4.name=堆叠升级
item.refinedstorage:upgrade.5.name=空间升级
item.refinedstorage:upgrade.6.name=精准采集升级 item.refinedstorage:upgrade.6.name=精准采集升级
item.refinedstorage:upgrade.7.name=时运升级 item.refinedstorage:upgrade.7.name=时运升级
item.refinedstorage:upgrade.8.name=时运升级 item.refinedstorage:upgrade.8.name=时运升级

View File

@@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "refinedstorage:items/interdimensional_upgrade"
}
}

View File

@@ -1,28 +0,0 @@
{
"type": "forge:ore_shaped",
"pattern": [
"EPE",
"RUR",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"type": "forge:ore_dict",
"ore": "netherStar"
},
"R": {
"item": "minecraft:end_rod"
},
"U": {
"item": "refinedstorage:upgrade",
"data": 0
}
},
"result": {
"item": "refinedstorage:upgrade",
"data": 5
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB