From a0521a0fdaade4a6cd613aa59b1b1475ad847406 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 28 Apr 2016 20:49:19 +0200 Subject: [PATCH] work 28-04-16 --- build.gradle | 2 +- .../refinedstorage/RefinedStorageBlocks.java | 2 - .../block/BlockCraftingCPU.java | 60 ------------------ .../block/BlockCraftingUnit.java | 7 -- .../block/EnumCraftingCPUType.java | 41 ------------ .../java/refinedstorage/gui/GuiStorage.java | 11 +++- .../refinedstorage/proxy/ClientProxy.java | 14 ---- .../refinedstorage/proxy/CommonProxy.java | 22 ------- .../refinedstorage/tile/TileController.java | 6 +- .../refinedstorage/tile/TileSolderer.java | 20 ++++-- .../tile/autocrafting/TileCraftingCPU.java | 20 ------ .../solderer/SoldererRecipeCraftingCPU.java | 41 ------------ .../blockstates/crafting_cpu.json | 31 --------- .../blockstates/crafting_unit.json | 30 --------- .../assets/refinedstorage/lang/en_US.lang | 5 -- .../assets/refinedstorage/lang/nl_NL.lang | 5 -- .../textures/blocks/16k_crafting_block.png | Bin 846 -> 0 bytes .../textures/blocks/16k_crafting_cpu.png | Bin 265 -> 0 bytes .../textures/blocks/1k_crafting_block.png | Bin 827 -> 0 bytes .../textures/blocks/1k_crafting_cpu.png | Bin 255 -> 0 bytes .../textures/blocks/4k_crafting_block.png | Bin 840 -> 0 bytes .../textures/blocks/4k_crafting_cpu.png | Bin 257 -> 0 bytes .../textures/blocks/64k_crafting_block.png | Bin 848 -> 0 bytes .../textures/blocks/64k_crafting_cpu.png | Bin 255 -> 0 bytes .../blocks/crafting_monitor_connected.png | Bin 201 -> 653 bytes .../blocks/crafting_monitor_disconnected.png | Bin 197 -> 605 bytes .../textures/blocks/crafting_unit.png | Bin 245 -> 0 bytes .../textures/blocks/monitor_connected.png | Bin 653 -> 0 bytes .../textures/blocks/monitor_disconnected.png | Bin 605 -> 0 bytes 29 files changed, 29 insertions(+), 288 deletions(-) delete mode 100755 src/main/java/refinedstorage/block/BlockCraftingCPU.java delete mode 100755 src/main/java/refinedstorage/block/BlockCraftingUnit.java delete mode 100755 src/main/java/refinedstorage/block/EnumCraftingCPUType.java delete mode 100755 src/main/java/refinedstorage/tile/autocrafting/TileCraftingCPU.java delete mode 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingCPU.java delete mode 100755 src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json delete mode 100755 src/main/resources/assets/refinedstorage/blockstates/crafting_unit.json delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_block.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_block.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_cpu.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_block.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_cpu.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_block.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_cpu.png mode change 100755 => 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png mode change 100755 => 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_unit.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/monitor_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/monitor_disconnected.png diff --git a/build.gradle b/build.gradle index 4e7c11604..6f6fc5e80 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9-12.16.0.1859-1.9" + version = "1.9-12.16.0.1866-1.9" runDir = "run" useDepAts = true mappings = "snapshot_20160312" diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java index 0cd81911c..0052446f4 100755 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -19,7 +19,5 @@ public final class RefinedStorageBlocks { public static final BlockRelay RELAY = new BlockRelay(); public static final BlockInterface INTERFACE = new BlockInterface(); public static final BlockCraftingMonitor CRAFTING_MONITOR = new BlockCraftingMonitor(); - public static final BlockCraftingCPU CRAFTING_CPU = new BlockCraftingCPU(); public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); - public static final BlockCraftingUnit CRAFTING_UNIT = new BlockCraftingUnit(); } diff --git a/src/main/java/refinedstorage/block/BlockCraftingCPU.java b/src/main/java/refinedstorage/block/BlockCraftingCPU.java deleted file mode 100755 index 209f88e16..000000000 --- a/src/main/java/refinedstorage/block/BlockCraftingCPU.java +++ /dev/null @@ -1,60 +0,0 @@ -package refinedstorage.block; - -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import refinedstorage.item.ItemBlockBase; -import refinedstorage.item.ItemBlockStorage; -import refinedstorage.tile.autocrafting.TileCraftingCPU; - -import java.util.List; - -public class BlockCraftingCPU extends BlockMachine { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumCraftingCPUType.class); - - public BlockCraftingCPU() { - super("crafting_cpu"); - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { - for (int i = 0; i <= 3; ++i) { - subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); - } - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[]{ - DIRECTION, - CONNECTED, - TYPE - }); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, EnumCraftingCPUType.getById(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return ((EnumCraftingCPUType) state.getValue(TYPE)).getId(); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileCraftingCPU(); - } - - @Override - public Item createItemForBlock() { - return new ItemBlockBase(this, true); - } -} diff --git a/src/main/java/refinedstorage/block/BlockCraftingUnit.java b/src/main/java/refinedstorage/block/BlockCraftingUnit.java deleted file mode 100755 index fb732a8e6..000000000 --- a/src/main/java/refinedstorage/block/BlockCraftingUnit.java +++ /dev/null @@ -1,7 +0,0 @@ -package refinedstorage.block; - -public class BlockCraftingUnit extends BlockBase { - public BlockCraftingUnit() { - super("crafting_unit"); - } -} diff --git a/src/main/java/refinedstorage/block/EnumCraftingCPUType.java b/src/main/java/refinedstorage/block/EnumCraftingCPUType.java deleted file mode 100755 index 6758b2b3e..000000000 --- a/src/main/java/refinedstorage/block/EnumCraftingCPUType.java +++ /dev/null @@ -1,41 +0,0 @@ -package refinedstorage.block; - -import net.minecraft.util.IStringSerializable; - -public enum EnumCraftingCPUType implements IStringSerializable { - TYPE_1K(0, "1k"), - TYPE_4K(1, "4k"), - TYPE_16K(2, "16k"), - TYPE_64K(3, "64k"); - - private int id; - private String name; - - EnumCraftingCPUType(int id, String name) { - this.id = id; - this.name = name; - } - - @Override - public String getName() { - return name; - } - - public int getId() { - return id; - } - - @Override - public String toString() { - return name; - } - - public static EnumCraftingCPUType getById(int id) { - for (EnumCraftingCPUType type : EnumCraftingCPUType.values()) { - if (type.getId() == id) { - return type; - } - } - return TYPE_1K; - } -} diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index 7d2ae5d88..f8cd59eae 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -53,8 +53,8 @@ public class GuiStorage extends GuiBase { priorityField.setEnableBackgroundDrawing(false); priorityField.setVisible(true); priorityField.setTextColor(16777215); - priorityField.setCanLoseFocus(false); - priorityField.setFocused(true); + priorityField.setCanLoseFocus(true); + priorityField.setFocused(false); } @Override @@ -92,6 +92,13 @@ public class GuiStorage extends GuiBase { } } + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + super.mouseClicked(mouseX, mouseY, mouseButton); + + priorityField.mouseClicked(mouseX, mouseY, mouseButton); + } + @Override protected void keyTyped(char character, int keyCode) throws IOException { if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) { diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 622803d76..b349f1db2 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -10,7 +10,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; import refinedstorage.block.EnumControllerType; -import refinedstorage.block.EnumCraftingCPUType; import refinedstorage.block.EnumGridType; import refinedstorage.block.EnumStorageType; import refinedstorage.item.*; @@ -119,23 +118,10 @@ public class ClientProxy extends CommonProxy { .build() ); - ModelLoader.setCustomStateMapper(RefinedStorageBlocks.CRAFTING_CPU, (new StateMap.Builder()) - .ignore(RefinedStorageBlocks.CRAFTING_CPU.DIRECTION) - .ignore(RefinedStorageBlocks.CRAFTING_CPU.CONNECTED) - .build() - ); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_UNIT), 0, new ModelResourceLocation("refinedstorage:crafting_unit", "inventory")); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=1k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=4k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=16k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=64k")); } } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 723bb042c..48c2e530b 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -20,7 +20,6 @@ import refinedstorage.item.*; import refinedstorage.network.*; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; -import refinedstorage.tile.autocrafting.TileCraftingCPU; import refinedstorage.tile.autocrafting.TileCraftingMonitor; import refinedstorage.tile.grid.TileGrid; import refinedstorage.tile.solderer.*; @@ -68,7 +67,6 @@ public class CommonProxy { GameRegistry.registerTileEntity(TileRelay.class, ID + ":relay"); GameRegistry.registerTileEntity(TileInterface.class, ID + ":interface"); GameRegistry.registerTileEntity(TileCraftingMonitor.class, ID + ":crafting_monitor"); - GameRegistry.registerTileEntity(TileCraftingCPU.class, ID + ":crafting_cpu"); GameRegistry.registerTileEntity(TileWirelessTransmitter.class, ID + ":wireless_transmitter"); registerBlock(RefinedStorageBlocks.CONTROLLER); @@ -87,9 +85,7 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.RELAY); registerBlock(RefinedStorageBlocks.INTERFACE); registerBlock(RefinedStorageBlocks.CRAFTING_MONITOR); - registerBlock(RefinedStorageBlocks.CRAFTING_CPU); registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER); - registerBlock(RefinedStorageBlocks.CRAFTING_UNIT); registerItem(RefinedStorageItems.STORAGE_DISK); registerItem(RefinedStorageItems.PATTERN); @@ -395,24 +391,6 @@ public class CommonProxy { SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); - // Crafting Unit - GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CRAFTING_UNIT), - "ECE", - "PMP", - "EDE", - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION) - ); - - // Crafting CPUs - SoldererRegistry.addRecipe(new SoldererRecipeCraftingCPU(EnumCraftingCPUType.TYPE_1K, ItemStoragePart.TYPE_1K)); - SoldererRegistry.addRecipe(new SoldererRecipeCraftingCPU(EnumCraftingCPUType.TYPE_4K, ItemStoragePart.TYPE_4K)); - SoldererRegistry.addRecipe(new SoldererRecipeCraftingCPU(EnumCraftingCPUType.TYPE_16K, ItemStoragePart.TYPE_16K)); - SoldererRegistry.addRecipe(new SoldererRecipeCraftingCPU(EnumCraftingCPUType.TYPE_64K, ItemStoragePart.TYPE_64K)); - // Crafting Monitor GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CRAFTING_MONITOR), "EGE", diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index d49a0f945..f3a1f5bea 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -70,6 +70,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor private boolean destroyed = false; + private long lastEnergyRerender; + private boolean machinesHavePosition(List tiles, BlockPos pos) { for (TileEntity tile : tiles) { if (tile.getPos().getX() == pos.getX() && tile.getPos().getY() == pos.getY() && tile.getPos().getZ() == pos.getZ()) { @@ -515,7 +517,9 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor energy.setEnergyStored(buf.readInt()); - if (lastEnergy != energy.getEnergyStored()) { + if (lastEnergy != energy.getEnergyStored() && System.currentTimeMillis() - lastEnergyRerender > 3000) { + lastEnergyRerender = System.currentTimeMillis(); + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 1911d95a1..cd11045a9 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -45,17 +45,25 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven if (newRecipe == null) { reset(); - } else if (newRecipe != recipe && inventory.getStackInSlot(3) == null) { - recipe = newRecipe; - progress = 0; - working = true; + } else if (newRecipe != recipe) { + boolean isSameItem = inventory.getStackInSlot(3) != null ? InventoryUtils.compareStackNoQuantity(inventory.getStackInSlot(3), newRecipe.getResult()) : false; - markDirty(); + if (inventory.getStackInSlot(3) == null || (isSameItem && ((inventory.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) < inventory.getStackInSlot(3).getMaxStackSize()))) { + recipe = newRecipe; + progress = 0; + working = true; + + markDirty(); + } } else if (working) { progress++; if (progress == recipe.getDuration()) { - inventory.setInventorySlotContents(3, recipe.getResult()); + if (inventory.getStackInSlot(3) != null) { + inventory.getStackInSlot(3).stackSize += recipe.getResult().stackSize; + } else { + inventory.setInventorySlotContents(3, recipe.getResult()); + } for (int i = 0; i < 3; ++i) { if (recipe.getRow(i) != null) { diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileCraftingCPU.java b/src/main/java/refinedstorage/tile/autocrafting/TileCraftingCPU.java deleted file mode 100755 index f91d59f42..000000000 --- a/src/main/java/refinedstorage/tile/autocrafting/TileCraftingCPU.java +++ /dev/null @@ -1,20 +0,0 @@ -package refinedstorage.tile.autocrafting; - -import net.minecraft.inventory.Container; -import refinedstorage.tile.TileMachine; - -public class TileCraftingCPU extends TileMachine { - @Override - public int getEnergyUsage() { - return 0; - } - - @Override - public void updateMachine() { - } - - @Override - public Class getContainer() { - return null; - } -} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingCPU.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingCPU.java deleted file mode 100755 index 11b9fbaeb..000000000 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingCPU.java +++ /dev/null @@ -1,41 +0,0 @@ -package refinedstorage.tile.solderer; - -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.block.EnumCraftingCPUType; -import refinedstorage.item.ItemBlockStorage; -import refinedstorage.item.ItemProcessor; - -public class SoldererRecipeCraftingCPU implements ISoldererRecipe { - private EnumCraftingCPUType type; - private int storagePart; - - public SoldererRecipeCraftingCPU(EnumCraftingCPUType type, int storagePart) { - this.type = type; - this.storagePart = storagePart; - } - - @Override - public ItemStack getRow(int row) { - if (row == 0) { - return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); - } else if (row == 1) { - return new ItemStack(RefinedStorageBlocks.CRAFTING_UNIT); - } else if (row == 2) { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - - return null; - } - - @Override - public ItemStack getResult() { - return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.CRAFTING_CPU, 1, type.getId())); - } - - @Override - public int getDuration() { - return 200; - } -} diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json deleted file mode 100755 index 4484baf4f..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "transform": "forge:default-block" - }, - "variants": { - "type": { - "1k": { - "textures": { - "all": "refinedstorage:blocks/1k_crafting_cpu" - } - }, - "4k": { - "textures": { - "all": "refinedstorage:blocks/4k_crafting_cpu" - } - }, - "16k": { - "textures": { - "all": "refinedstorage:blocks/16k_crafting_cpu" - } - }, - "64k": { - "textures": { - "all": "refinedstorage:blocks/64k_crafting_cpu" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_unit.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_unit.json deleted file mode 100755 index a14647459..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_unit.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/crafting_unit" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index a6396e475..ac0c18e43 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -97,11 +97,6 @@ block.refinedstorage:storage.4.name=Creative Storage Block block.refinedstorage:relay.name=Relay block.refinedstorage:interface.name=Interface block.refinedstorage:crafting_monitor.name=Crafting Monitor -block.refinedstorage:crafting_unit.name=Crafting Unit -block.refinedstorage:crafting_cpu.0.name=1k Crafting CPU -block.refinedstorage:crafting_cpu.1.name=4k Crafting CPU -block.refinedstorage:crafting_cpu.2.name=16k Crafting CPU -block.refinedstorage:crafting_cpu.3.name=64k Crafting CPU block.refinedstorage:wireless_transmitter.name=Wireless Transmitter item.refinedstorage:storage_disk.0.name=1k Storage Disk diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 2f89c4035..e19a102fa 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -97,11 +97,6 @@ block.refinedstorage:storage.4.name=Creative Opslag Blok block.refinedstorage:relay.name=Relais block.refinedstorage:interface.name=Interface block.refinedstorage:crafting_monitor.name=Crafting Monitor -block.refinedstorage:crafting_unit.name=Crafting Eenheid -block.refinedstorage:crafting_cpu.0.name=1k Crafting CPU -block.refinedstorage:crafting_cpu.1.name=4k Crafting CPU -block.refinedstorage:crafting_cpu.2.name=16k Crafting CPU -block.refinedstorage:crafting_cpu.3.name=64k Crafting CPU block.refinedstorage:wireless_transmitter.name=Draadloze Zender item.refinedstorage:storage_disk.0.name=1k Opslagschijf diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_block.png deleted file mode 100644 index abdd0618db3f374aaf8063b4fc3cba99e6dddbcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`&xP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M`%t=H+R5(v1l3Pz2Q4q&Bk+=4t={KpD1w^Bd)mUMLU04o_9ASmv zstdT{g4Cq_27S;36-2zX6{!eyT^Ff!7yKr^_+a8K(HJ_WlbMqQ(XsFFZ6n= zC1o;msnm2VCMFWIvm)iB2p3I7&Mrgo101|BXWvQ%cZ7Ky1e|^YLyIQGM$dd@?<<77RAYE)D8lOs3=a& zOOuimN~I<;OWV4>X&A+3bH~slU%rMH7b9{KhDSv4^+KM=7mEjq@S9@Xe4OTaDjcQ+A$xkVqN>??eNEFKg+?x(_uwGI zab{~T(c9NYG0Yf36vt5*+k<$mTFcgI>nF;FqS%8$2ga1&{|Yb+z=Q=RxZMmw?s1O6 z*oASSa=1~cgu=U<^OK6*?O#2c&C{Jm?X*W Ye^qXEEpA8~r~m)}07*qoM6N<$f_Pqg(f|Me diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png deleted file mode 100755 index da37787859cd003c8e55489490a7057d509fe9bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ35DWj_o@k*40}kfB|Cef?O^>0^y zdC*@Jc~C}x*OL35NdxDv9;Vlo)*Jp>GDQEZN<9;j!)_q!aOLr_LmMp~GXImRId;S= zv{W)UO-JK^*AmJ5eS0F44)|SoerA>3wuNFp?p(UX{os)}8@FStJkS*kp00i_>zopr E0D!JtUH||9 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_block.png deleted file mode 100644 index ff54ee5b6177b0a412a3a327f5bc4df33e6689cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmV-B1H}A^P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M`xk*GpR5(v1j$2dOP!PxSopg|ts(sO^2uOh3NWxWA5JCc^Aza3( zZ6Dgcw$8Lw>t#9uf|3MCNP|HO+UW-=Q$xab*Y#iTZ8e?yt}bRmRT+el2{N5oRBZD>^6cRkPkt?fC8Tt z^So5xB_TVu`ag%?Z>|3Ls$Uj>$mOzWE|X3rw-B!v0>QBvA)ghwbg7W73jE0Ij7{|x z*3ib^Xxxy3m0l0^mAcWc4b+CIo`Vt$0#9+k(?J-9p{EW9hWaT2V}f{;CgTj= zY1O)|GhM0cax=~lQJP>V0svUR4`8qX#xax%5@CjnhNvhLlv{PBS!$S^f12{$E;KKyw_ak19$78qIp_!Rk zU^bf#teTs%EiTM|`TS|`0#LT=By}Z;C1rt33 zJFss1{}=Q|GmQ#48A3=wM%!LJSE_jd!2}vLhp>7W)5La zQoDHn9-Y;k`||ed!;e-bBt%bRT_#jmeE7n>J2ypoY8CtXb_&(sFjyk^ufFS=m4tHb u0vF+j2|Wj;B3d&Q7O!N;th^WWn(<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M`#z{m$R5(v1k84lbU=+t2amkWpFZVrWl+xm5amzMg6L~CsT1u&c z41rS0wGf@zyM2IVi;;0hF3LqqK@f%mXQIoJW$*TN_L!ZVbCUCae*cs6U>pjTvva(i z;~YFMY;Se@J(OpfiaIYid7gLh9D^v9g%Dz>BH?Hvsl@jb<$Wr7us6KE8eLxvr&r^f zX<|PWPbpGZ4o4%hECUK)Hk#fI_@!t#7?lH2IhcxcCnIe-?EM&bC&N%GCMRRTxGcwF zVo0*i0Fw+ zZbd#GtHtqo=}N7PRo{MWH;Ft_AR6+?(wfPHnckRpd|r>_cSl9HB9%sGBx^Eq=0$#; zWK757j*##RA&*P+2_Bbe-Hes%6>ZpW4z%j!d1-V`z%|`%;?eH|-JLRfrx;l?66>Q* zd)QS6y=)famk-A3-RwE$nuOhS+Ue0cCPHFFa+ux2EdFWU$>>#2EUNar$jwOP|z#cm_pJDCSB zW(Mz`{Qdaw*WS!n)Z1QVx+f*=9%yN5I-9|kpRLdimUTO+9S7wVa{Y#$dO5fG{3%$S z1FPA7gATfx-EDfyNjo5dF#}21SZL!}o67-Q9Psi-TJ^9~IqKHYZZx7r=!q40$a4mg z#EeUefTlKC8gS6cGZumV+ODSCm5f#^bWSY-v%y2)VD15$LNG>C5N;Nf=2zNuYlka0KHxzVHuBVO~H# SyTq9Q00000#LT=By}Z;C1rt33 zJf_-o`Op>5k`)nsq+1;(?9WoGSB$aZA!J8GHQv@%)j~m79FZ wM+6S(GrcV-7Aau9&%9JdJ!I*E!V`1EnP!?lU8J>76KFewr>mdKI;Vst0L&j&f&c&j diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_block.png deleted file mode 100644 index 605e0276bc74bc2bb85b5d41a5d025468b451f1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 848 zcmV-W1F!svP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M`&PhZ;R5(v1k!^3%P!z}eowhJK_TVd*F~k*UX}K-X0UIC>ZAa4; zHp$e)Xv`9$Sz@M4wnVnUcpRm4g*qO#eE~I^n8m2^y>B#e30~v5|8tX*`#b-0Z!Y42 zLBgbg2QW0__xW3j3RSN+;O=F-UYcQO01=WT34%ai3Y@Set;w>S$*kYaWc$WoU<~@* z!FlguUEYwTG@s;Gg;g%eVNMLeaXcD{3fyXn6QR~bxvvkQhTY4aK1hohS(H39D-B9;oL+(|sTB$cHtya0M z9e3Pw;N!jP_u1cHw?-c}|4>$@UFxXE8U&P@l6#p$W@m2D6chA?LQMFMFL7En$a$Ka zqun-no-J4F_bUBgo5-+#1~VF?be~zE_T$C4$Eb47#^{7 z000IxPa;#6Dcng=1fboFpJZ8ztsOM$g=Vv)DkYVr0zQ(ZNw0?hxQl==f}$vay8#8f zfbjv==V2>Hwd!HLT&PzHHPT5@xCan`gr0=kVwpzFW;6V32j+A-TrL-mV|ekPR4g2q zk19|eXyvBdIN?}y*zI<+$&8GRjl(dROz?gariq#9*_{_V+t0WEYZA3gm{Isnh{9zu ajsFExN`YwH#e&uV00000#LT=By}Z;C1rt33 zJ`>juD`vkO6~0$3m_NC!fivi**>xA^N(JsB;njDhq+M(GW8cD?+H)*bw)p3@(gwyw uOY*0tcl|7GILTZTkThYMv~#6*w)x){?T-c~ktIO889ZJ6T-G@yGywqTn^(jD diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png old mode 100755 new mode 100644 index 77eb4187db360def453833a4ac93b1c08d62e46b..323d1fc90e5fbd3c98d60bb4fa719335f190d396 GIT binary patch delta 573 zcmV-D0>b^t0gVNaB#|)~3cmmV4!;371ydxEQzm}`3rR#lR5(vXl8b8EP#nh3JE>_x zsEyGQ6(@!e2@;XeAxa5~tFg)P_BtE1(2nlH>SpWpHM(kI>`UxBvBNLF|KZEY|B`S* zDv*INS(s+6R{I#qteRM>5Oz(LVi-obTqcN4yVHZ*o=aUyspB|3#FYc@x-OoyTCGl} z({6vYRZS(jt~Z;_Y$Qcda(Q+^g~EqiE^_&NHkXC9?Mqcv2?7m}+Wow7zHHqa-@6SC zxHm^KnM|Y6D3wYCVcWKnRh*km?{@3m`SdnZBbAaZ%gPt>q);qiRw|Y9er$i~Pk-=hH+&3-lW_DqV!}L-Wf^@l8JS=f zO3$P-`snv3!Dt$epZ4SDw}?IbXv#V z4&Pb*XB`THh=WEl;dvg1jkP;_b>Jf&`=?nFxY_zXKBl0SGV&E&;{kh(s(FgFoR;P@tD}Q9Na@q?Yi1MAB3h zCm#j+L3mq8*EQ@Fi$$K}Nh}tJ&;TVfu%1RjmxC}9512T1aa{Z#N6}+@KhYNV00000 LNkvXXu0mjf`|l1M delta 115 zcmV-(0F3{Q1<3)BBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCQtx6NklvH{IJG=v7|>1iSXi5mX@2LQAI VudkZGLkR!?002ovPDHLkV1o3lD31UD diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png old mode 100755 new mode 100644 index 81c84e384177a68580e4d6c8cfd3f79e086be065..552e0310e43a5c468222cf8624c0d1fca2a9c3a0 GIT binary patch delta 524 zcmV+n0`vXF0o??UB#|)~3c&yX4#5Gqk!$UdQzm}_+et)0R5(v{k`0TSKoExaKbd%n zTuzOLiP#Vkg9L-fm5^{qf|LZwU&@D{=&5N;e_7u(rPmhv?9MQ|`_9bDO6I_ZIn*4- zb=|KW&ccCT0PH$cV%zp?HY2cL8|*>24-ettaMMOm#@ z)9IAJeBW0`>f-=huXG}>#h}SoOjLaLee@*gxLhuW!(mfZO7gZ(8GU|USicHW8sW0M7@jr4p2ZI4*uj(to*LZJ# zC6q-$Z$Yop-3IHjfZ)yZR3wP9XwPjy5b`|BvNTN-xIDuu&(bVSut6sT?!pyCk)Riz z5bHROqbRyuF7R;@BfHC@WdP3$cxZ?T$8mUU_+QdEPLc%v9|R=K=N!iq)HY3%W!ZG& z@pw9&&e1udog&1aoX-$I1~K7z9)AZq@H{4upwIR}uLtWh41@TIeL{jYvjpLpUdfo^ z|L8Cc125kh>H*vqSeA*s$z;N@9ATIqKmqiCf9^n)2k40d3QGse_I?88pJfiX^NJb( O0000e71_lOv2nh^;AJ7~FK}djpPC|179AN0#LT=By}Z;C1rt33 zJ)Ese;mCqvmxN2bZe?^J zG%heMIczh2P5=M`3rR#lR5(vXl8b8EP#nh3JE>_xsEyGQ6(@!e2@;XeAxa5~tFg)P z_BtE1(2nlH>SpWpHM(kI>`UxBvBNLF|KZEY|B`S*Dv*INS(s+6R{I#qteRM>5Oz(L zVi-obTqcN4yVHZ*o=aUyspB|3#FYc@x-OoyTCGl}({8m@O(nXnH=E6DBt=njd3HgC z!iQWga`}8VmxZeKQ%EU=~Wxq%->H_b0(<8jhd#25R&$MgMo@y3|%M_|T4!i8liD3D~ys2HLsdQU!m4hDN2bZe?^J zG%heMIczh2P5=M_+et)0R5(v{k`0TSKoExaKbd%nTuzOLiP#Vkg9L-fm5^{qf|LZw zU&@D{=&5N;e_7u(rPmhv?9MQ|`_9bDO6I_ZIn*4-b=|KW&ccCT0PH$cV%zp?HY2cL z8|*>24-ettaMkznx7+tWXgU-{S*=#n>6E~H-&aTK;{aT*bRw_CpvhNE zRDAb+^d#uGTrP*hVN+F2T_d5c>k2V~rmmW*{3y$^kR;jjJWbb#KGD%jlBD0#2Z%lw zRVB+Z>MDv%&#~60&GS?wh_YzU zZ9x$7Jj=2)O%u30!z$0xEKRUMCj{=o6-AMt7oHI7IF6$zx?C>saS|iD%c5lf&kJ~H zhzZAWcx?Dz(l}0%1pXfcB+Ta=#}m{xO_OEWvy~$+4u^eHT r9zX%~fPd~ll?UjF0}4wA%l3W(<)38^xbun{00000NkvXXu0mjf?{5wA