diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index a1108b444..e578efa08 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -16,7 +16,7 @@ import refinedstorage.gui.sidebutton.SideButtonGridSearchBoxMode; import refinedstorage.gui.sidebutton.SideButtonGridSortingDirection; import refinedstorage.gui.sidebutton.SideButtonGridSortingType; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.jei.PluginRefinedStorage; +import refinedstorage.jei.RefinedStorageJEIPlugin; import refinedstorage.network.GridPullFlags; import refinedstorage.network.MessageGridCraftingClear; import refinedstorage.network.MessageGridCraftingPush; @@ -355,7 +355,7 @@ public class GuiGrid extends GuiBase { protected void keyTyped(char character, int keyCode) throws IOException { if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) { if (RefinedStorage.hasJei() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { - PluginRefinedStorage.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); + RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); } } else { super.keyTyped(character, keyCode); diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/RefinedStorageJEIPlugin.java similarity index 90% rename from src/main/java/refinedstorage/jei/PluginRefinedStorage.java rename to src/main/java/refinedstorage/jei/RefinedStorageJEIPlugin.java index 4f86824ef..70dffc772 100755 --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/RefinedStorageJEIPlugin.java @@ -1,46 +1,46 @@ -package refinedstorage.jei; - -import mezz.jei.api.IJeiRuntime; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.JEIPlugin; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.storage.DiskStorage; -import refinedstorage.tile.TileStorage; - -@JEIPlugin -public class PluginRefinedStorage implements IModPlugin { - public static PluginRefinedStorage INSTANCE; - - private IJeiRuntime runtime; - - @Override - public void register(IModRegistry registry) { - INSTANCE = this; - - registry.getRecipeTransferRegistry().addRecipeTransferHandler(new GridRecipeTransferHandler()); - - registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); - - registry.addRecipeHandlers(new SoldererRecipeHandler()); - - registry.addRecipes(SoldererRecipeMaker.getRecipes()); - - registry.addRecipeCategoryCraftingItem(new ItemStack(RefinedStorageBlocks.SOLDERER), SoldererRecipeCategory.ID); - - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_DISK, DiskStorage.NBT_ITEMS, DiskStorage.NBT_STORED); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); - } - - @Override - public void onRuntimeAvailable(IJeiRuntime runtime) { - this.runtime = runtime; - } - - public IJeiRuntime getRuntime() { - return runtime; - } -} +package refinedstorage.jei; + +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.JEIPlugin; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.storage.DiskStorage; +import refinedstorage.tile.TileStorage; + +@JEIPlugin +public class RefinedStorageJEIPlugin implements IModPlugin { + public static RefinedStorageJEIPlugin INSTANCE; + + private IJeiRuntime runtime; + + @Override + public void register(IModRegistry registry) { + INSTANCE = this; + + registry.getRecipeTransferRegistry().addRecipeTransferHandler(new GridRecipeTransferHandler()); + + registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); + + registry.addRecipeHandlers(new SoldererRecipeHandler()); + + registry.addRecipes(SoldererRecipeMaker.getRecipes()); + + registry.addRecipeCategoryCraftingItem(new ItemStack(RefinedStorageBlocks.SOLDERER), SoldererRecipeCategory.ID); + + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_DISK, DiskStorage.NBT_ITEMS, DiskStorage.NBT_STORED); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); + } + + @Override + public void onRuntimeAvailable(IJeiRuntime runtime) { + this.runtime = runtime; + } + + public IJeiRuntime getRuntime() { + return runtime; + } +} diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 637125029..9c0db7d0c 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -219,11 +219,11 @@ public class CommonProxy { // Wireless Grid GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL), - " P ", - "ERE", + "EPE", + "EAE", "EEE", 'P', new ItemStack(Items.ender_pearl), - 'R', new ItemStack(Items.redstone), + 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java index 4312366c0..d78aa3ba9 100755 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java @@ -19,11 +19,11 @@ public class SoldererRecipeStorage implements ISoldererRecipe { @Override public ItemStack getRow(int row) { if (row == 0) { - return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); } else if (row == 1) { return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); } else if (row == 2) { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); } return null; diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index c247def72..9e7cbc7c6 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -1,7 +1,7 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller -gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.1=Creatieve Controller gui.refinedstorage:controller.machine_position.x=X: %d gui.refinedstorage:controller.machine_position.y=Y: %d gui.refinedstorage:controller.machine_position.z=Z: %d @@ -57,7 +57,7 @@ misc.refinedstorage:cancel_all=Annuleer alles misc.refinedstorage:priority=Prioriteit misc.refinedstorage:processing=Verwerking -sidebutton.refinedstorage:compare.1=Vergelijken op damage +sidebutton.refinedstorage:compare.1=Vergelijken op schade sidebutton.refinedstorage:compare.2=Vergelijken op NBT sidebutton.refinedstorage:redstone_mode=Redstone Mode @@ -87,7 +87,7 @@ sidebutton.refinedstorage:detector.mode.1=Redstone signaal aan wanneer op het aa sidebutton.refinedstorage:detector.mode.2=Redstone signaal aan wanneer boven het aantal block.refinedstorage:controller.0.name=Controller -block.refinedstorage:controller.1.name=Creative Controller +block.refinedstorage:controller.1.name=Creatieve Controller block.refinedstorage:cable.name=Kabel block.refinedstorage:grid.0.name=Rooster block.refinedstorage:grid.1.name=Crafting Rooster @@ -101,11 +101,11 @@ block.refinedstorage:machine_casing.name=Machine-omhulsel block.refinedstorage:solderer.name=Soldeerder block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor -block.refinedstorage:storage.0.name=1k Opslag Blok -block.refinedstorage:storage.1.name=4k Opslag Blok -block.refinedstorage:storage.2.name=16k Opslag Blok -block.refinedstorage:storage.3.name=64k Opslag Blok -block.refinedstorage:storage.4.name=Creative Opslag Blok +block.refinedstorage:storage.0.name=1k Opslagblok +block.refinedstorage:storage.1.name=4k Opslagblok +block.refinedstorage:storage.2.name=16k Opslagblok +block.refinedstorage:storage.3.name=64k Opslagblok +block.refinedstorage:storage.4.name=Creative Opslagblok block.refinedstorage:relay.name=Relais block.refinedstorage:interface.name=Interface block.refinedstorage:crafting_monitor.name=Crafting Monitor @@ -119,18 +119,18 @@ item.refinedstorage:storage_disk.2.name=16k Opslagschijf item.refinedstorage:storage_disk.3.name=64k Opslagschijf item.refinedstorage:storage_disk.4.name=Creative Opslagschijf item.refinedstorage:wireless_grid.0.name=Draadloos Rooster -item.refinedstorage:wireless_grid.1.name=Creative Draadloos Rooster -item.refinedstorage:quartz_enriched_iron.name=Quartz Verrijkt Iron -item.refinedstorage:core.0.name=Constructie Core -item.refinedstorage:core.1.name=Destructie Core -item.refinedstorage:silicon.name=Silicon +item.refinedstorage:wireless_grid.1.name=Creatieve Draadloos Rooster +item.refinedstorage:quartz_enriched_iron.name=Quartz Verrijkte IJzerstaaf +item.refinedstorage:core.0.name=Constructiekern +item.refinedstorage:core.1.name=Destructiekern +item.refinedstorage:silicon.name=Siliconen item.refinedstorage:processor.0.name=Gedrukte Basis Processor item.refinedstorage:processor.1.name=Gedrukte Verbeterde Processor item.refinedstorage:processor.2.name=Gedrukte Uitgebreide Processor item.refinedstorage:processor.3.name=Basis Processor item.refinedstorage:processor.4.name=Verbeterde Processor item.refinedstorage:processor.5.name=Uitgebreide Processor -item.refinedstorage:processor.6.name=Gedrukte Silicon +item.refinedstorage:processor.6.name=Gedrukte Siliconen item.refinedstorage:storage_part.0.name=1k Opslagdeel item.refinedstorage:storage_part.1.name=4k Opslagdeel item.refinedstorage:storage_part.2.name=16k Opslagdeel