From 60ada318d40dccd2fe12d92a6a5af20e86ebe0ff Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 19 Nov 2018 21:22:01 +0100 Subject: [PATCH] Removed the Interdimensional Upgrade. Removed the FE/t cost per block in the Network Transmitter. --- CHANGELOG.md | 2 ++ .../raoulvdberge/refinedstorage/RSConfig.java | 6 +--- .../apiimpl/network/node/NetworkNode.java | 1 + .../node/NetworkNodeNetworkTransmitter.java | 34 +++--------------- .../ContainerNetworkTransmitter.java | 3 -- .../gui/GuiNetworkTransmitter.java | 4 +-- .../refinedstorage/item/ItemUpgrade.java | 9 ++--- .../refinedstorage/tile/TileController.java | 1 + .../tile/TileNetworkTransmitter.java | 2 -- .../assets/refinedstorage/lang/de_de.lang | 2 -- .../assets/refinedstorage/lang/en_us.lang | 2 -- .../assets/refinedstorage/lang/es_es.lang | 2 -- .../assets/refinedstorage/lang/fr_fr.lang | 2 -- .../assets/refinedstorage/lang/ko_kr.lang | 2 -- .../assets/refinedstorage/lang/nl_nl.lang | 2 -- .../assets/refinedstorage/lang/pt_br.lang | 2 -- .../assets/refinedstorage/lang/ru_ru.lang | 2 -- .../assets/refinedstorage/lang/zh_cn.lang | 2 -- .../models/item/interdimensional_upgrade.json | 6 ---- .../recipes/interdimensional_upgrade.json | 28 --------------- .../textures/gui/network_transmitter.png | Bin 16435 -> 1899 bytes .../items/interdimensional_upgrade.png | Bin 1504 -> 0 bytes 22 files changed, 13 insertions(+), 101 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/models/item/interdimensional_upgrade.json delete mode 100644 src/main/resources/assets/refinedstorage/recipes/interdimensional_upgrade.json delete mode 100755 src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 80c68a5b2..f390a530c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Fixed another duplication bug with a disconnected Crafting Grid (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 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) - Added fluid functions for the fluid autocrafting to the OpenComputers integration (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java index a118e9d10..be9bd6737 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java @@ -44,7 +44,6 @@ public class RSConfig { public int patternGridUsage; public int fluidGridUsage; public int networkTransmitterUsage; - public float networkTransmitterPerBlockUsage; public int networkReceiverUsage; public int diskManipulatorUsage; public int securityManagerUsage; @@ -104,7 +103,6 @@ public class RSConfig { public int speedUpgradeUsage; public int craftingUpgradeUsage; public int stackUpgradeUsage; - public int interdimensionalUpgradeUsage; public int silkTouchUpgradeUsage; public int fortuneUpgradeUsagePerFortune; //endregion @@ -195,8 +193,7 @@ public class RSConfig { 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"); 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"); - networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", ENERGY, 1, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up"); + networkTransmitterUsage = config.getInt("networkTransmitter", ENERGY, 64, 0, Integer.MAX_VALUE, "The energy used by Network Transmitters"); 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"); 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"); 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"); - 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"); 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 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index af3a52427..31bf70272 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -23,6 +23,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.UUID; +// TODO: getId: return a ResourceLocation. public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { private static final String NBT_OWNER = "Owner"; private static final String NBT_DIRECTION = "Direction"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index df0ab6ba4..d033860b3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -4,11 +4,9 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.util.Action; 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.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.item.ItemNetworkCard; -import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,24 +14,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.CombinedInvWrapper; import javax.annotation.Nullable; public class NetworkNodeNetworkTransmitter extends NetworkNode { 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)) { @Override protected void onContentsChanged(int slot) { @@ -66,7 +52,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { super.write(tag); StackUtils.writeItems(networkCard, 0, tag); - StackUtils.writeItems(upgrades, 1, tag); return tag; } @@ -76,7 +61,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { super.read(tag); StackUtils.readItems(networkCard, 0, tag); - StackUtils.readItems(upgrades, 1, tag); } @Override @@ -86,23 +70,16 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { @Override public int getEnergyUsage() { - return Math.min( - RS.INSTANCE.config.interdimensionalUpgradeUsage, - RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage() - ); + return RS.INSTANCE.config.networkTransmitterUsage; } public ItemHandlerBase getNetworkCard() { return networkCard; } - public ItemHandlerUpgrade getUpgrades() { - return upgrades; - } - @Override public IItemHandler getDrops() { - return new CombinedInvWrapper(networkCard, upgrades); + return networkCard; } @Nullable @@ -126,12 +103,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { return world.provider.getDimension() == receiverDimension; } - public boolean isDimensionSupported() { - return isSameDimension() || upgrades.hasUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL); - } - private boolean canTransmit() { - return canUpdate() && receiver != null && isDimensionSupported(); + return canUpdate() && receiver != null; } @Override @@ -151,6 +124,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { if (canTransmit()) { if (!isSameDimension()) { final World dimensionWorld = DimensionManager.getWorld(receiverDimension); + if (dimensionWorld != null) { operator.apply(dimensionWorld, receiver, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java index e2420fc68..31cd21497 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java @@ -10,11 +10,8 @@ public class ContainerNetworkTransmitter extends ContainerBase { addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20)); - addSlotToContainer(new SlotItemHandler(networkTransmitter.getNode().getUpgrades(), 0, 187, 6)); - addPlayerInventory(8, 55); - transferManager.addBiTransfer(player.inventory, networkTransmitter.getNode().getUpgrades()); transferManager.addBiTransfer(player.inventory, networkTransmitter.getNode().getNetworkCard()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java index 30fe26997..c725d1571 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java @@ -8,7 +8,7 @@ public class GuiNetworkTransmitter extends GuiBase { private TileNetworkTransmitter networkTransmitter; public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) { - super(container, 210, 137); + super(container, 176, 137); this.networkTransmitter = networkTransmitter; } @@ -37,8 +37,6 @@ public class GuiNetworkTransmitter extends GuiBase { if (networkTransmitter.getNode().getNetworkCard().getStackInSlot(0).isEmpty()) { 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()) { distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue()); } else if (TileNetworkTransmitter.DISTANCE.getValue() != -1) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java index d1b5750f6..e6fde929b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java @@ -22,7 +22,6 @@ public class ItemUpgrade extends ItemBase { public static final int TYPE_SPEED = 2; public static final int TYPE_CRAFTING = 3; 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_FORTUNE_1 = 7; 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, "speed_upgrade"), new ResourceLocation(RS.ID, "stack_upgrade"), - new ResourceLocation(RS.ID, "interdimensional_upgrade"), new ResourceLocation(RS.ID, "silk_touch_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_CRAFTING, new ModelResourceLocation(RS.ID + ":crafting_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_FORTUNE_1, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory")); modelRegistration.setModel(this, TYPE_FORTUNE_2, new ModelResourceLocation(RS.ID + ":fortune_upgrade", "inventory")); @@ -82,7 +79,9 @@ public class ItemUpgrade extends ItemBase { } for (int i = 0; i <= 9; ++i) { - items.add(new ItemStack(this, 1, i)); + if (i != 5) { // Removal of interdimensional upgrade + items.add(new ItemStack(this, 1, i)); + } } } @@ -110,8 +109,6 @@ public class ItemUpgrade extends ItemBase { return RS.INSTANCE.config.craftingUpgradeUsage; case TYPE_STACK: return RS.INSTANCE.config.stackUpgradeUsage; - case TYPE_INTERDIMENSIONAL: - return RS.INSTANCE.config.interdimensionalUpgradeUsage; case TYPE_SILK_TOUCH: return RS.INSTANCE.config.silkTouchUpgradeUsage; case TYPE_FORTUNE_1: diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java index 14e0b0511..9bb350507 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java @@ -71,6 +71,7 @@ import java.util.function.Predicate; 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, INetworkNodeVisitor { private static final Comparator CLIENT_NODE_COMPARATOR = (left, right) -> { if (left.getEnergyUsage() == right.getEnergyUsage()) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java index 7f33022e9..d9a7bcb53 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java @@ -19,12 +19,10 @@ public class TileNetworkTransmitter extends TileNode RECEIVER_DIMENSION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getReceiverDimension()); - public static final TileDataParameter RECEIVER_DIMENSION_SUPPORTED = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isDimensionSupported()); public TileNetworkTransmitter() { dataManager.addWatchedParameter(DISTANCE); dataManager.addWatchedParameter(RECEIVER_DIMENSION); - dataManager.addWatchedParameter(RECEIVER_DIMENSION_SUPPORTED); } @Override diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang index 7f2f05de6..b96d67062 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_de.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang @@ -43,7 +43,6 @@ gui.refinedstorage:network_transmitter=Netzwerksender gui.refinedstorage:network_transmitter.distance=%d Blöcke gui.refinedstorage:network_transmitter.dimension=Dimension %d 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.in=Ein 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.3.name=Fertigungsupgrade item.refinedstorage:upgrade.4.name=Stapelupgrade -item.refinedstorage:upgrade.5.name=Interdimensionles Upgrade item.refinedstorage:upgrade.6.name=Behutsamkeitsupgrade item.refinedstorage:upgrade.7.name=Glücksupgrade item.refinedstorage:upgrade.8.name=Glücksupgrade diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang index 3b50ede4a..38d8222f9 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang @@ -48,7 +48,6 @@ gui.refinedstorage:network_transmitter=Network Transmitter gui.refinedstorage:network_transmitter.distance=%d block(s) gui.refinedstorage:network_transmitter.dimension=Dimension %d 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.in=In 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.3.name=Crafting 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.7.name=Fortune Upgrade item.refinedstorage:upgrade.8.name=Fortune Upgrade diff --git a/src/main/resources/assets/refinedstorage/lang/es_es.lang b/src/main/resources/assets/refinedstorage/lang/es_es.lang index c74f8ac80..2211c18a9 100644 --- a/src/main/resources/assets/refinedstorage/lang/es_es.lang +++ b/src/main/resources/assets/refinedstorage/lang/es_es.lang @@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter=Emisor de Red gui.refinedstorage:network_transmitter.distance=%d bloque(s) gui.refinedstorage:network_transmitter.dimension=Dimensión %d 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.in=Entrada 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.3.name=Mejora de Fabricació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.7.name=Mejora de Fortuna item.refinedstorage:upgrade.8.name=Mejora de Fortuna diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang index 29a081d2e..6ad635f4e 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang @@ -35,7 +35,6 @@ gui.refinedstorage:network_transmitter=Emetteur réseau gui.refinedstorage:network_transmitter.distance=%d bloc(s) gui.refinedstorage:network_transmitter.dimension=Dimension %d 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.in=Entrée 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.3.name=Amélioration de craft 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.7.name=Amélioration Fortune item.refinedstorage:storage_housing.name=Boitier de stockage diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang index a6b86dc58..e242079cb 100644 --- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang +++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang @@ -34,7 +34,6 @@ gui.refinedstorage:network_transmitter=네트워크 송신기 gui.refinedstorage:network_transmitter.distance=%d블럭 gui.refinedstorage:network_transmitter.dimension=월드: %d gui.refinedstorage:network_transmitter.missing_card=부족한 네트워크 카드 -gui.refinedstorage:network_transmitter.missing_upgrade=업그레이드를 넣으세요. gui.refinedstorage:fluid_interface=액체 인터페이스 gui.refinedstorage:fluid_interface.in=입력 gui.refinedstorage:fluid_interface.out=출력 @@ -234,7 +233,6 @@ item.refinedstorage:upgrade.1.name=범위 업그레이드 item.refinedstorage:upgrade.2.name=속도 업그레이드 item.refinedstorage:upgrade.3.name=제작 업그레이드 item.refinedstorage:upgrade.4.name=세트 업그레이드 -item.refinedstorage:upgrade.5.name=다중 월드 업그레이드 item.refinedstorage:upgrade.6.name=섬세한 손길 업그레이드 item.refinedstorage:upgrade.7.name=행운 업그레이드 item.refinedstorage:storage_housing.name=빈 저장 디스크 diff --git a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang index 2435bc73e..926026e0d 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang @@ -29,7 +29,6 @@ gui.refinedstorage:network_transmitter=Netwerkzender gui.refinedstorage:network_transmitter.distance=%d blokken gui.refinedstorage:network_transmitter.dimension=Dimensie %d 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.in=In 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.3.name=Crafting Upgrade item.refinedstorage:upgrade.4.name=Stack Upgrade -item.refinedstorage:upgrade.5.name=Interdimensionale Upgrade item.refinedstorage:storage_housing.name=Opslagomhulsel item.refinedstorage:filter.name=Filter item.refinedstorage:network_card.name=Netwerk Kaart \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang index e9a1fcf82..27506319f 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang @@ -35,7 +35,6 @@ gui.refinedstorage:network_transmitter=Transmissor de Rede gui.refinedstorage:network_transmitter.distance=%d Blocos 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_upgrade=Inserir Aprimoramento gui.refinedstorage:fluid_interface=Interface de Fluidos gui.refinedstorage:fluid_interface.in=Entrada 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.3.name=Aprimoramento de Fabricação 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.7.name=Aprimoramento de Fortuna item.refinedstorage:upgrade.8.name=Aprimoramento de Fortuna diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang index 8b9d59e95..65d285f5d 100755 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang @@ -48,7 +48,6 @@ gui.refinedstorage:network_transmitter=Сетевой передатчик gui.refinedstorage:network_transmitter.distance=%d блоков gui.refinedstorage:network_transmitter.dimension=Измерение %d gui.refinedstorage:network_transmitter.missing_card=Не найдена сетевая карта -gui.refinedstorage:network_transmitter.missing_upgrade=Вставьте улучшение gui.refinedstorage:fluid_interface=Жидкостный интерфейс gui.refinedstorage:fluid_interface.in=В gui.refinedstorage:fluid_interface.out=Из @@ -285,7 +284,6 @@ item.refinedstorage:upgrade.1.name=Улучшение: "Радиус" item.refinedstorage:upgrade.2.name=Улучшение: "Скорость" item.refinedstorage:upgrade.3.name=Улучшение: "Крафт" item.refinedstorage:upgrade.4.name=Улучшение: "Стак" -item.refinedstorage:upgrade.5.name=Улучшение: "Измерение" item.refinedstorage:upgrade.6.name=Улучшение: "Шёлковое касание" item.refinedstorage:upgrade.7.name=Улучшение: "Удача" item.refinedstorage:upgrade.8.name=Улучшение: "Удача" diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang index a856b0496..5c5bc0b75 100755 --- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang +++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang @@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter=网络变送器 gui.refinedstorage:network_transmitter.distance=%d 个方块 gui.refinedstorage:network_transmitter.dimension=维度 %d gui.refinedstorage:network_transmitter.missing_card=缺失网卡 -gui.refinedstorage:network_transmitter.missing_upgrade=缺失插入升级 gui.refinedstorage:fluid_interface=流体面板 gui.refinedstorage:fluid_interface.in=输入 gui.refinedstorage:fluid_interface.out=输出 @@ -238,7 +237,6 @@ item.refinedstorage:upgrade.1.name=范围升级 item.refinedstorage:upgrade.2.name=速度升级 item.refinedstorage:upgrade.3.name=合成升级 item.refinedstorage:upgrade.4.name=堆叠升级 -item.refinedstorage:upgrade.5.name=空间升级 item.refinedstorage:upgrade.6.name=精准采集升级 item.refinedstorage:upgrade.7.name=时运升级 item.refinedstorage:upgrade.8.name=时运升级 diff --git a/src/main/resources/assets/refinedstorage/models/item/interdimensional_upgrade.json b/src/main/resources/assets/refinedstorage/models/item/interdimensional_upgrade.json deleted file mode 100755 index 7fef125b7..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/interdimensional_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/interdimensional_upgrade" - } -} diff --git a/src/main/resources/assets/refinedstorage/recipes/interdimensional_upgrade.json b/src/main/resources/assets/refinedstorage/recipes/interdimensional_upgrade.json deleted file mode 100644 index 2025607d0..000000000 --- a/src/main/resources/assets/refinedstorage/recipes/interdimensional_upgrade.json +++ /dev/null @@ -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 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png index b5b2088780dfd9e2fa23cde16d48214066207b6c..1d25ea190e1bc3c3a884f280e3b46999cbe8d012 100755 GIT binary patch literal 1899 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 diff --git a/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png deleted file mode 100755 index 41c40bf99121899cb859578e81100d2a31806681..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1504 zcmbVMeNYr-7~hmZ2EQAV0aMr2lpOc-Ztreaj*t5=PQ8;kQL)f&Z|^{`($3NPc-S_MHJIi6QWCZ;4J2r|-@?eM~JO!Q5Nhu_J)j|4a*>&`rVp&Zo91Qj4z0oe~wS4b!T zULXX@OIko0f($K{a`W^&_k3QILxd2uAtE6Kq7fu5Bccdm5ztXTD3HQdtmo))43z>_ zYzgb8+=?9(O4$`ESXkl76)TEFE`VjEqiGQyItT$>KqH~zu*OHM*nnRi&ZFBTh7OqM zMON%FsXTWMYL``jvV;j2X_`jO96_@d1H;Zj8H#2}iX&+Xr)Zw0c!oj;9}GrQ13}*F zm@^m)uB=$0t}8rAmX(zeWd=f43rL#dIFe#WhQXl)u9b&%A%cgssWA@@poyxa=#m^p zqaFpnyh68Pkm=(qgcP^?iQ}*~C=`^8j0g%z6BHQ=Mej9Wt?6FyFO8>KYq{kLAiY47 zSEwS)M{sHk47Gc9pr|2a!!J-Jm=vMdA&V54HhFu84WS4E3D~4 zSOl@y5{x~FH9Ql`+f^XwvYIQ)#jz^LDU@|tE0h(~ZXd`xnz}>^2jnvC!hyB~gN%`5aMo;~a6vS(xW!L#IF!Xgn+<+5OBu02eBl4;M?z9$ zv{?RAJh3fUk=@*gH+fmA0=-ahaf``mm@1T^25%$rrPIA#x)<$xG-Yh zT3_u;o3S51w%)*OQ1GS$%g*MdIBt6W`6xUOd0|@Ou;csMIx+__f$_?9cJ7 zRNTX%t;;)df64icFKQ#0n?1wka{H6IK>Vbh-Zy*tf7-lf?>ptTjQb`0whwoH>lgYK zf99O7?MOX*;1;G1hD@yQKmpZVpG=b z$S1BfK1kmC-OT&_>Db1E*0#8uO%AN7zHyPcG~-UB|MwSC*2TA0+orTxjxF#+B(8-+PZYcBim`Dt|ji1^9cto)&9I->?OGqsb6T+UO#m3jihv1wdds%|b9{TBm^5tk%7a(B&jc8yF~7JW<;1lsU59QxtU5QjBeU!HmF|;Q72lnf zp`Yf@8h^F-uggSb6M7z5?^#pOh>1O|vv-;oU01n|nfTe@7q=s6doJBqN`usce=j1z}h*yZ`u0|qpJ2apBlSs-iF(& zRt|3q)^$3Mc0OECe(dj!6K1s4pZoO&adG*9YR_(M`<64uO4E~kh!0%6P!rL&ME|)i Lr^m71=BxY%i6|?~