diff --git a/build.gradle b/build.gradle index 644584a37..0a8472927 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,8 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' version = "0.3" -group = "storagecraft" -archivesBaseName = "storagecraft" +group = "refinedstorage" +archivesBaseName = "refinedstorage" minecraft { version = "1.9-12.16.0.1770-1.9" diff --git a/src/main/java/storagecraft/StorageCraft.java b/src/main/java/refinedstorage/RefinedStorage.java similarity index 72% rename from src/main/java/storagecraft/StorageCraft.java rename to src/main/java/refinedstorage/RefinedStorage.java index 6d8c7dc24..56f301b47 100644 --- a/src/main/java/storagecraft/StorageCraft.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -1,4 +1,4 @@ -package storagecraft; +package refinedstorage; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -12,13 +12,13 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import storagecraft.item.ItemStorageCell; -import storagecraft.proxy.CommonProxy; +import refinedstorage.item.ItemStorageCell; +import refinedstorage.proxy.CommonProxy; -@Mod(modid = StorageCraft.ID, version = StorageCraft.VERSION) -public final class StorageCraft +@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) +public final class RefinedStorage { - public static final String ID = "storagecraft"; + public static final String ID = "refinedstorage"; public static final String VERSION = "0.3"; public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); @@ -28,7 +28,7 @@ public final class StorageCraft @Override public ItemStack getIconItemStack() { - return new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); + return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); } @Override @@ -38,11 +38,11 @@ public final class StorageCraft } }; - @SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy") + @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") public static CommonProxy PROXY; @Instance - public static StorageCraft INSTANCE; + public static RefinedStorage INSTANCE; @EventHandler public void preInit(FMLPreInitializationEvent e) diff --git a/src/main/java/storagecraft/StorageCraftBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java similarity index 89% rename from src/main/java/storagecraft/StorageCraftBlocks.java rename to src/main/java/refinedstorage/RefinedStorageBlocks.java index 0a56c765d..12bf84f9c 100644 --- a/src/main/java/storagecraft/StorageCraftBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -1,8 +1,8 @@ -package storagecraft; +package refinedstorage; -import storagecraft.block.*; +import refinedstorage.block.*; -public final class StorageCraftBlocks +public final class RefinedStorageBlocks { public static final BlockController CONTROLLER = new BlockController(); public static final BlockCable CABLE = new BlockCable(); diff --git a/src/main/java/storagecraft/StorageCraftGUI.java b/src/main/java/refinedstorage/RefinedStorageGui.java similarity index 86% rename from src/main/java/storagecraft/StorageCraftGUI.java rename to src/main/java/refinedstorage/RefinedStorageGui.java index 36fded8c7..66c55a6d9 100644 --- a/src/main/java/storagecraft/StorageCraftGUI.java +++ b/src/main/java/refinedstorage/RefinedStorageGui.java @@ -1,6 +1,6 @@ -package storagecraft; +package refinedstorage; -public final class StorageCraftGUI +public final class RefinedStorageGui { public static final int CONTROLLER = 0; public static final int GRID = 1; diff --git a/src/main/java/storagecraft/StorageCraftItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java similarity index 84% rename from src/main/java/storagecraft/StorageCraftItems.java rename to src/main/java/refinedstorage/RefinedStorageItems.java index d2c8a63ea..5d0349c10 100644 --- a/src/main/java/storagecraft/StorageCraftItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -1,8 +1,8 @@ -package storagecraft; +package refinedstorage; -import storagecraft.item.*; +import refinedstorage.item.*; -public final class StorageCraftItems +public final class RefinedStorageItems { public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java similarity index 92% rename from src/main/java/storagecraft/block/BlockBase.java rename to src/main/java/refinedstorage/block/BlockBase.java index dbcc80c7a..78ae7db9f 100644 --- a/src/main/java/storagecraft/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; @@ -14,9 +14,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.tile.TileBase; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.tile.TileBase; +import refinedstorage.util.InventoryUtils; public abstract class BlockBase extends Block { @@ -31,13 +31,13 @@ public abstract class BlockBase extends Block this.name = name; setHardness(0.6F); - setCreativeTab(StorageCraft.TAB); + setCreativeTab(RefinedStorage.TAB); } @Override public String getUnlocalizedName() { - return "block." + StorageCraft.ID + ":" + name; + return "block." + RefinedStorage.ID + ":" + name; } @Override diff --git a/src/main/java/storagecraft/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java similarity index 97% rename from src/main/java/storagecraft/block/BlockCable.java rename to src/main/java/refinedstorage/block/BlockCable.java index 57d193dc0..c5ae2db6f 100644 --- a/src/main/java/storagecraft/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -9,7 +9,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.tile.TileCable; +import refinedstorage.tile.TileCable; public class BlockCable extends BlockBase { diff --git a/src/main/java/storagecraft/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java similarity index 74% rename from src/main/java/storagecraft/block/BlockConstructor.java rename to src/main/java/refinedstorage/block/BlockConstructor.java index 865f7b923..a5cba3d6a 100644 --- a/src/main/java/storagecraft/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileConstructor; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileConstructor; public class BlockConstructor extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockConstructor extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java similarity index 91% rename from src/main/java/storagecraft/block/BlockController.java rename to src/main/java/refinedstorage/block/BlockController.java index 5e484b04b..b2e43dbdc 100644 --- a/src/main/java/storagecraft/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import java.util.List; import net.minecraft.block.properties.IProperty; @@ -16,9 +16,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileController; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileController; public class BlockController extends BlockBase { @@ -86,7 +86,7 @@ public class BlockController extends BlockBase { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java similarity index 74% rename from src/main/java/storagecraft/block/BlockDestructor.java rename to src/main/java/refinedstorage/block/BlockDestructor.java index 50628c1d5..1340fec88 100644 --- a/src/main/java/storagecraft/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileDestructor; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileDestructor; public class BlockDestructor extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockDestructor extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java similarity index 88% rename from src/main/java/storagecraft/block/BlockDetector.java rename to src/main/java/refinedstorage/block/BlockDetector.java index ffe4a7ba8..56c4b09fe 100644 --- a/src/main/java/storagecraft/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -12,9 +12,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileDetector; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileDetector; public class BlockDetector extends BlockMachine { @@ -79,7 +79,7 @@ public class BlockDetector extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockDrive.java b/src/main/java/refinedstorage/block/BlockDrive.java similarity index 74% rename from src/main/java/storagecraft/block/BlockDrive.java rename to src/main/java/refinedstorage/block/BlockDrive.java index e65458c44..383efe7d2 100644 --- a/src/main/java/storagecraft/block/BlockDrive.java +++ b/src/main/java/refinedstorage/block/BlockDrive.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileDrive; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileDrive; public class BlockDrive extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockDrive extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java similarity index 74% rename from src/main/java/storagecraft/block/BlockExporter.java rename to src/main/java/refinedstorage/block/BlockExporter.java index 4ab86715f..c99a30ccb 100644 --- a/src/main/java/storagecraft/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileExporter; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileExporter; public class BlockExporter extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockExporter extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java similarity index 74% rename from src/main/java/storagecraft/block/BlockExternalStorage.java rename to src/main/java/refinedstorage/block/BlockExternalStorage.java index 6c3b325ac..470db6b9d 100644 --- a/src/main/java/storagecraft/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileExternalStorage; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileExternalStorage; public class BlockExternalStorage extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockExternalStorage extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java similarity index 87% rename from src/main/java/storagecraft/block/BlockGrid.java rename to src/main/java/refinedstorage/block/BlockGrid.java index 6750a5b7d..8f4d12621 100644 --- a/src/main/java/storagecraft/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import java.util.List; import net.minecraft.block.properties.IProperty; @@ -14,9 +14,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileGrid; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileGrid; public class BlockGrid extends BlockMachine { @@ -70,7 +70,7 @@ public class BlockGrid extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java similarity index 74% rename from src/main/java/storagecraft/block/BlockImporter.java rename to src/main/java/refinedstorage/block/BlockImporter.java index 0c55f5096..80bb1732b 100644 --- a/src/main/java/storagecraft/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileImporter; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileImporter; public class BlockImporter extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockImporter extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockMachine.java b/src/main/java/refinedstorage/block/BlockMachine.java similarity index 93% rename from src/main/java/storagecraft/block/BlockMachine.java rename to src/main/java/refinedstorage/block/BlockMachine.java index 7b693fff3..c75a2a9e4 100644 --- a/src/main/java/storagecraft/block/BlockMachine.java +++ b/src/main/java/refinedstorage/block/BlockMachine.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -6,7 +6,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import storagecraft.tile.TileMachine; +import refinedstorage.tile.TileMachine; public abstract class BlockMachine extends BlockBase { diff --git a/src/main/java/storagecraft/block/BlockMachineCasing.java b/src/main/java/refinedstorage/block/BlockMachineCasing.java similarity index 79% rename from src/main/java/storagecraft/block/BlockMachineCasing.java rename to src/main/java/refinedstorage/block/BlockMachineCasing.java index 8519b200b..9a41b9a93 100644 --- a/src/main/java/storagecraft/block/BlockMachineCasing.java +++ b/src/main/java/refinedstorage/block/BlockMachineCasing.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; public class BlockMachineCasing extends BlockBase { diff --git a/src/main/java/storagecraft/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java similarity index 74% rename from src/main/java/storagecraft/block/BlockSolderer.java rename to src/main/java/refinedstorage/block/BlockSolderer.java index 59ad117c0..9a782c960 100644 --- a/src/main/java/storagecraft/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileSolderer; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileSolderer; public class BlockSolderer extends BlockMachine { @@ -29,7 +29,7 @@ public class BlockSolderer extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java similarity index 84% rename from src/main/java/storagecraft/block/BlockStorage.java rename to src/main/java/refinedstorage/block/BlockStorage.java index e6fc8dbc2..286ad9e35 100644 --- a/src/main/java/storagecraft/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import java.util.ArrayList; import java.util.List; @@ -18,11 +18,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftGUI; -import storagecraft.item.ItemBlockStorage; -import storagecraft.tile.TileStorage; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageGui; +import refinedstorage.item.ItemBlockStorage; +import refinedstorage.tile.TileStorage; public class BlockStorage extends BlockMachine { @@ -76,7 +76,7 @@ public class BlockStorage extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } return true; @@ -100,7 +100,7 @@ public class BlockStorage extends BlockMachine { List drops = new ArrayList(); - ItemStack stack = new ItemStack(StorageCraftBlocks.STORAGE, 1, StorageCraftBlocks.STORAGE.getMetaFromState(state)); + ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java similarity index 84% rename from src/main/java/storagecraft/block/BlockWirelessTransmitter.java rename to src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index 738864d40..9438cc94a 100644 --- a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; @@ -12,9 +12,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileWirelessTransmitter; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.tile.TileWirelessTransmitter; public class BlockWirelessTransmitter extends BlockMachine { @@ -54,7 +54,7 @@ public class BlockWirelessTransmitter extends BlockMachine { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/storagecraft/block/EnumControllerType.java b/src/main/java/refinedstorage/block/EnumControllerType.java similarity index 93% rename from src/main/java/storagecraft/block/EnumControllerType.java rename to src/main/java/refinedstorage/block/EnumControllerType.java index 533efb6ad..e64f09d74 100644 --- a/src/main/java/storagecraft/block/EnumControllerType.java +++ b/src/main/java/refinedstorage/block/EnumControllerType.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/storagecraft/block/EnumGridType.java b/src/main/java/refinedstorage/block/EnumGridType.java similarity index 93% rename from src/main/java/storagecraft/block/EnumGridType.java rename to src/main/java/refinedstorage/block/EnumGridType.java index 3c3c4ec5d..8c0553ebe 100644 --- a/src/main/java/storagecraft/block/EnumGridType.java +++ b/src/main/java/refinedstorage/block/EnumGridType.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/storagecraft/block/EnumStorageType.java b/src/main/java/refinedstorage/block/EnumStorageType.java similarity index 90% rename from src/main/java/storagecraft/block/EnumStorageType.java rename to src/main/java/refinedstorage/block/EnumStorageType.java index 07c83ba22..0ad8a8708 100644 --- a/src/main/java/storagecraft/block/EnumStorageType.java +++ b/src/main/java/refinedstorage/block/EnumStorageType.java @@ -1,4 +1,4 @@ -package storagecraft.block; +package refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/storagecraft/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java similarity index 89% rename from src/main/java/storagecraft/container/ContainerBase.java rename to src/main/java/refinedstorage/container/ContainerBase.java index 953003a20..19b8349d9 100644 --- a/src/main/java/storagecraft/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -1,4 +1,4 @@ -package storagecraft.container; +package refinedstorage.container; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import storagecraft.container.slot.SlotDisabled; -import storagecraft.container.slot.SlotSpecimen; +import refinedstorage.container.slot.SlotDisabled; +import refinedstorage.container.slot.SlotSpecimen; public abstract class ContainerBase extends Container { diff --git a/src/main/java/storagecraft/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java similarity index 81% rename from src/main/java/storagecraft/container/ContainerConstructor.java rename to src/main/java/refinedstorage/container/ContainerConstructor.java index d5463d695..3dd4add9c 100644 --- a/src/main/java/storagecraft/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -1,11 +1,11 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import storagecraft.container.slot.SlotSpecimen; -import storagecraft.tile.TileConstructor; +import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.tile.TileConstructor; public class ContainerConstructor extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerController.java b/src/main/java/refinedstorage/container/ContainerController.java similarity index 81% rename from src/main/java/storagecraft/container/ContainerController.java rename to src/main/java/refinedstorage/container/ContainerController.java index 247acf592..9cc437a7e 100644 --- a/src/main/java/storagecraft/container/ContainerController.java +++ b/src/main/java/refinedstorage/container/ContainerController.java @@ -1,4 +1,4 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/storagecraft/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java similarity index 81% rename from src/main/java/storagecraft/container/ContainerDestructor.java rename to src/main/java/refinedstorage/container/ContainerDestructor.java index cf9e9aad4..ed279dd82 100644 --- a/src/main/java/storagecraft/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -1,4 +1,4 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/storagecraft/container/ContainerDetector.java b/src/main/java/refinedstorage/container/ContainerDetector.java similarity index 68% rename from src/main/java/storagecraft/container/ContainerDetector.java rename to src/main/java/refinedstorage/container/ContainerDetector.java index b48eb528e..d5b94568e 100644 --- a/src/main/java/storagecraft/container/ContainerDetector.java +++ b/src/main/java/refinedstorage/container/ContainerDetector.java @@ -1,8 +1,8 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -import storagecraft.container.slot.SlotSpecimen; -import storagecraft.tile.TileDetector; +import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.tile.TileDetector; public class ContainerDetector extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerDrive.java b/src/main/java/refinedstorage/container/ContainerDrive.java similarity index 75% rename from src/main/java/storagecraft/container/ContainerDrive.java rename to src/main/java/refinedstorage/container/ContainerDrive.java index cf38380c9..31a08d0fb 100644 --- a/src/main/java/storagecraft/container/ContainerDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDrive.java @@ -1,12 +1,12 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftItems; -import storagecraft.container.slot.BasicItemValidator; -import storagecraft.container.slot.SlotFiltered; -import storagecraft.tile.TileDrive; +import refinedstorage.RefinedStorageItems; +import refinedstorage.container.slot.BasicItemValidator; +import refinedstorage.container.slot.SlotFiltered; +import refinedstorage.tile.TileDrive; public class ContainerDrive extends ContainerBase { @@ -19,7 +19,7 @@ public class ContainerDrive extends ContainerBase for (int i = 0; i < 8; ++i) { - addSlotToContainer(new SlotFiltered(drive, i, x, y, new BasicItemValidator(StorageCraftItems.STORAGE_CELL))); + addSlotToContainer(new SlotFiltered(drive, i, x, y, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); if ((i + 1) % 2 == 0) { diff --git a/src/main/java/storagecraft/container/ContainerExporter.java b/src/main/java/refinedstorage/container/ContainerExporter.java similarity index 70% rename from src/main/java/storagecraft/container/ContainerExporter.java rename to src/main/java/refinedstorage/container/ContainerExporter.java index 94e86ca8d..07e9bddee 100644 --- a/src/main/java/storagecraft/container/ContainerExporter.java +++ b/src/main/java/refinedstorage/container/ContainerExporter.java @@ -1,8 +1,8 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -import storagecraft.container.slot.SlotSpecimen; -import storagecraft.tile.TileExporter; +import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.tile.TileExporter; public class ContainerExporter extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java similarity index 81% rename from src/main/java/storagecraft/container/ContainerGrid.java rename to src/main/java/refinedstorage/container/ContainerGrid.java index a89d8fc43..e31a62fa3 100644 --- a/src/main/java/storagecraft/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -1,10 +1,10 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; -import storagecraft.block.EnumGridType; -import storagecraft.container.slot.SlotGridCraftingResult; -import storagecraft.tile.TileGrid; +import refinedstorage.block.EnumGridType; +import refinedstorage.container.slot.SlotGridCraftingResult; +import refinedstorage.tile.TileGrid; public class ContainerGrid extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerImporter.java b/src/main/java/refinedstorage/container/ContainerImporter.java similarity index 70% rename from src/main/java/storagecraft/container/ContainerImporter.java rename to src/main/java/refinedstorage/container/ContainerImporter.java index f6eab1b6d..92807eeaa 100644 --- a/src/main/java/storagecraft/container/ContainerImporter.java +++ b/src/main/java/refinedstorage/container/ContainerImporter.java @@ -1,8 +1,8 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -import storagecraft.container.slot.SlotSpecimen; -import storagecraft.tile.TileImporter; +import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.tile.TileImporter; public class ContainerImporter extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java similarity index 84% rename from src/main/java/storagecraft/container/ContainerSolderer.java rename to src/main/java/refinedstorage/container/ContainerSolderer.java index 54b8ff796..70c5ac1bf 100644 --- a/src/main/java/storagecraft/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -1,10 +1,10 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import storagecraft.container.slot.SlotOutput; -import storagecraft.tile.TileSolderer; +import refinedstorage.container.slot.SlotOutput; +import refinedstorage.tile.TileSolderer; public class ContainerSolderer extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerStorage.java b/src/main/java/refinedstorage/container/ContainerStorage.java similarity index 78% rename from src/main/java/storagecraft/container/ContainerStorage.java rename to src/main/java/refinedstorage/container/ContainerStorage.java index 04d549c5a..1d2c0c88f 100644 --- a/src/main/java/storagecraft/container/ContainerStorage.java +++ b/src/main/java/refinedstorage/container/ContainerStorage.java @@ -1,8 +1,8 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import storagecraft.container.slot.SlotSpecimen; +import refinedstorage.container.slot.SlotSpecimen; public class ContainerStorage extends ContainerBase { diff --git a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java similarity index 74% rename from src/main/java/storagecraft/container/ContainerWirelessTransmitter.java rename to src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java index 0bf99dc89..802b37dd4 100644 --- a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java @@ -1,14 +1,14 @@ -package storagecraft.container; +package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftItems; -import storagecraft.container.slot.BasicItemValidator; -import storagecraft.container.slot.SlotFiltered; -import storagecraft.container.slot.SlotOutput; -import storagecraft.tile.TileWirelessTransmitter; +import refinedstorage.RefinedStorageItems; +import refinedstorage.container.slot.BasicItemValidator; +import refinedstorage.container.slot.SlotFiltered; +import refinedstorage.container.slot.SlotOutput; +import refinedstorage.tile.TileWirelessTransmitter; public class ContainerWirelessTransmitter extends ContainerBase { @@ -17,7 +17,7 @@ public class ContainerWirelessTransmitter extends ContainerBase super(player); addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl))); - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(StorageCraftItems.WIRELESS_GRID))); + addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID))); addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 20)); addPlayerInventory(8, 55); diff --git a/src/main/java/storagecraft/container/slot/BasicItemValidator.java b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java similarity index 84% rename from src/main/java/storagecraft/container/slot/BasicItemValidator.java rename to src/main/java/refinedstorage/container/slot/BasicItemValidator.java index 700763577..53a1071ac 100644 --- a/src/main/java/storagecraft/container/slot/BasicItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/storagecraft/container/slot/IItemValidator.java b/src/main/java/refinedstorage/container/slot/IItemValidator.java similarity index 71% rename from src/main/java/storagecraft/container/slot/IItemValidator.java rename to src/main/java/refinedstorage/container/slot/IItemValidator.java index 7a6b41b4e..5a38125f0 100644 --- a/src/main/java/storagecraft/container/slot/IItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/IItemValidator.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/storagecraft/container/slot/SlotDisabled.java b/src/main/java/refinedstorage/container/slot/SlotDisabled.java similarity index 85% rename from src/main/java/storagecraft/container/slot/SlotDisabled.java rename to src/main/java/refinedstorage/container/slot/SlotDisabled.java index 564035915..8e6851582 100644 --- a/src/main/java/storagecraft/container/slot/SlotDisabled.java +++ b/src/main/java/refinedstorage/container/slot/SlotDisabled.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/storagecraft/container/slot/SlotFiltered.java b/src/main/java/refinedstorage/container/slot/SlotFiltered.java similarity index 87% rename from src/main/java/storagecraft/container/slot/SlotFiltered.java rename to src/main/java/refinedstorage/container/slot/SlotFiltered.java index f30c7073d..2d43a1603 100644 --- a/src/main/java/storagecraft/container/slot/SlotFiltered.java +++ b/src/main/java/refinedstorage/container/slot/SlotFiltered.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/storagecraft/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java similarity index 93% rename from src/main/java/storagecraft/container/slot/SlotGridCraftingResult.java rename to src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index 3c7cf701a..fa110f6b8 100644 --- a/src/main/java/storagecraft/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -1,11 +1,11 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; -import storagecraft.tile.TileGrid; +import refinedstorage.tile.TileGrid; public class SlotGridCraftingResult extends SlotCrafting { diff --git a/src/main/java/storagecraft/container/slot/SlotOutput.java b/src/main/java/refinedstorage/container/slot/SlotOutput.java similarity index 85% rename from src/main/java/storagecraft/container/slot/SlotOutput.java rename to src/main/java/refinedstorage/container/slot/SlotOutput.java index 1a13409b4..e3e6c3f45 100644 --- a/src/main/java/storagecraft/container/slot/SlotOutput.java +++ b/src/main/java/refinedstorage/container/slot/SlotOutput.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/storagecraft/container/slot/SlotSpecimen.java b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java similarity index 88% rename from src/main/java/storagecraft/container/slot/SlotSpecimen.java rename to src/main/java/refinedstorage/container/slot/SlotSpecimen.java index b7aeed5bd..860d5e11d 100644 --- a/src/main/java/storagecraft/container/slot/SlotSpecimen.java +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java @@ -1,4 +1,4 @@ -package storagecraft.container.slot; +package refinedstorage.container.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java similarity index 96% rename from src/main/java/storagecraft/gui/GuiBase.java rename to src/main/java/refinedstorage/gui/GuiBase.java index 34988056f..badc1535c 100644 --- a/src/main/java/storagecraft/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -1,4 +1,4 @@ -package storagecraft.gui; +package refinedstorage.gui; import java.io.IOException; import java.util.ArrayList; @@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; -import storagecraft.StorageCraft; -import storagecraft.gui.sidebutton.SideButton; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.sidebutton.SideButton; public abstract class GuiBase extends GuiContainer { @@ -146,7 +146,7 @@ public abstract class GuiBase extends GuiContainer public void bindTexture(String file) { - bindTexture(StorageCraft.ID, file); + bindTexture(RefinedStorage.ID, file); } public void bindTexture(String base, String file) diff --git a/src/main/java/storagecraft/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java similarity index 68% rename from src/main/java/storagecraft/gui/GuiConstructor.java rename to src/main/java/refinedstorage/gui/GuiConstructor.java index f4b08d62d..d55805eb7 100644 --- a/src/main/java/storagecraft/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -1,10 +1,10 @@ -package storagecraft.gui; +package refinedstorage.gui; -import storagecraft.container.ContainerConstructor; -import storagecraft.gui.sidebutton.SideButtonCompare; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileConstructor; -import storagecraft.util.InventoryUtils; +import refinedstorage.container.ContainerConstructor; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileConstructor; +import refinedstorage.util.InventoryUtils; public class GuiConstructor extends GuiBase { @@ -42,7 +42,7 @@ public class GuiConstructor extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:constructor")); + drawString(7, 7, t("gui.refinedstorage:constructor")); drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java similarity index 66% rename from src/main/java/storagecraft/gui/GuiController.java rename to src/main/java/refinedstorage/gui/GuiController.java index 14c205ea5..f3101449d 100644 --- a/src/main/java/storagecraft/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -1,8 +1,8 @@ -package storagecraft.gui; +package refinedstorage.gui; -import storagecraft.container.ContainerController; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileController; +import refinedstorage.container.ContainerController; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileController; public class GuiController extends GuiBase { @@ -46,14 +46,14 @@ public class GuiController extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:controller." + controller.getType().getId())); + drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); drawString(7, 87, t("container.inventory")); - drawString(31, 20, t("misc.storagecraft:energy_usage", controller.getEnergyUsage())); + drawString(31, 20, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage())); if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.storagecraft:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } } } diff --git a/src/main/java/storagecraft/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java similarity index 70% rename from src/main/java/storagecraft/gui/GuiDestructor.java rename to src/main/java/refinedstorage/gui/GuiDestructor.java index e98c490f3..4194a0be0 100644 --- a/src/main/java/storagecraft/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -1,8 +1,8 @@ -package storagecraft.gui; +package refinedstorage.gui; -import storagecraft.container.ContainerDestructor; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileDestructor; +import refinedstorage.container.ContainerDestructor; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileDestructor; public class GuiDestructor extends GuiBase { @@ -37,7 +37,7 @@ public class GuiDestructor extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:destructor")); + drawString(7, 7, t("gui.refinedstorage:destructor")); drawString(7, 39, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java similarity index 76% rename from src/main/java/storagecraft/gui/GuiDetector.java rename to src/main/java/refinedstorage/gui/GuiDetector.java index 4b14d4e99..bd4c5abf4 100644 --- a/src/main/java/storagecraft/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -1,15 +1,15 @@ -package storagecraft.gui; +package refinedstorage.gui; import com.google.common.primitives.Ints; import java.io.IOException; import net.minecraft.client.gui.GuiTextField; -import storagecraft.StorageCraft; -import storagecraft.container.ContainerDetector; -import storagecraft.gui.sidebutton.SideButtonCompare; -import storagecraft.gui.sidebutton.SideButtonDetectorMode; -import storagecraft.network.MessageDetectorAmountUpdate; -import storagecraft.tile.TileDetector; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.container.ContainerDetector; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonDetectorMode; +import refinedstorage.network.MessageDetectorAmountUpdate; +import refinedstorage.tile.TileDetector; +import refinedstorage.util.InventoryUtils; public class GuiDetector extends GuiBase { @@ -59,7 +59,7 @@ public class GuiDetector extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:detector")); + drawString(7, 7, t("gui.refinedstorage:detector")); drawString(7, 43, t("container.inventory")); } @@ -72,7 +72,7 @@ public class GuiDetector extends GuiBase if (result != null) { - StorageCraft.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); + RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); } } else diff --git a/src/main/java/storagecraft/gui/GuiDrive.java b/src/main/java/refinedstorage/gui/GuiDrive.java similarity index 73% rename from src/main/java/storagecraft/gui/GuiDrive.java rename to src/main/java/refinedstorage/gui/GuiDrive.java index e1f729012..86690ea46 100644 --- a/src/main/java/storagecraft/gui/GuiDrive.java +++ b/src/main/java/refinedstorage/gui/GuiDrive.java @@ -1,13 +1,13 @@ -package storagecraft.gui; +package refinedstorage.gui; import com.google.common.primitives.Ints; import java.io.IOException; import net.minecraft.client.gui.GuiTextField; -import storagecraft.StorageCraft; -import storagecraft.container.ContainerDrive; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.network.MessagePriorityUpdate; -import storagecraft.tile.TileDrive; +import refinedstorage.RefinedStorage; +import refinedstorage.container.ContainerDrive; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.network.MessagePriorityUpdate; +import refinedstorage.tile.TileDrive; public class GuiDrive extends GuiBase { @@ -54,8 +54,8 @@ public class GuiDrive extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:drive")); - drawString(51, 20, t("misc.storagecraft:priority")); + drawString(7, 7, t("gui.refinedstorage:drive")); + drawString(51, 20, t("misc.refinedstorage:priority")); drawString(7, 96, t("container.inventory")); } @@ -68,7 +68,7 @@ public class GuiDrive extends GuiBase if (result != null) { - StorageCraft.NETWORK.sendToServer(new MessagePriorityUpdate(drive.getPos(), result)); + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(drive.getPos(), result)); } } else diff --git a/src/main/java/storagecraft/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java similarity index 68% rename from src/main/java/storagecraft/gui/GuiExporter.java rename to src/main/java/refinedstorage/gui/GuiExporter.java index 5d9829376..364121ec9 100644 --- a/src/main/java/storagecraft/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -1,10 +1,10 @@ -package storagecraft.gui; +package refinedstorage.gui; -import storagecraft.container.ContainerExporter; -import storagecraft.gui.sidebutton.SideButtonCompare; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileExporter; -import storagecraft.util.InventoryUtils; +import refinedstorage.container.ContainerExporter; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileExporter; +import refinedstorage.util.InventoryUtils; public class GuiExporter extends GuiBase { @@ -42,7 +42,7 @@ public class GuiExporter extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:exporter")); + drawString(7, 7, t("gui.refinedstorage:exporter")); drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java similarity index 84% rename from src/main/java/storagecraft/gui/GuiGrid.java rename to src/main/java/refinedstorage/gui/GuiGrid.java index 16b278a5b..12e9d4160 100644 --- a/src/main/java/storagecraft/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -1,4 +1,4 @@ -package storagecraft.gui; +package refinedstorage.gui; import java.io.IOException; import java.util.ArrayList; @@ -14,18 +14,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import storagecraft.StorageCraft; -import storagecraft.block.EnumGridType; -import storagecraft.container.ContainerGrid; -import storagecraft.gui.sidebutton.SideButtonGridSortingDirection; -import storagecraft.gui.sidebutton.SideButtonGridSortingType; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.network.MessageGridCraftingClear; -import storagecraft.network.MessageStoragePull; -import storagecraft.network.MessageStoragePush; -import storagecraft.storage.StorageItem; -import storagecraft.tile.TileController; -import storagecraft.tile.TileGrid; +import refinedstorage.RefinedStorage; +import refinedstorage.block.EnumGridType; +import refinedstorage.container.ContainerGrid; +import refinedstorage.gui.sidebutton.SideButtonGridSortingDirection; +import refinedstorage.gui.sidebutton.SideButtonGridSortingType; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.network.MessageGridCraftingClear; +import refinedstorage.network.MessageStoragePull; +import refinedstorage.network.MessageStoragePush; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.TileController; +import refinedstorage.tile.TileGrid; public class GuiGrid extends GuiBase { @@ -143,7 +143,7 @@ public class GuiGrid extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:grid")); + drawString(7, 7, t("gui.refinedstorage:grid")); if (grid.getType() == EnumGridType.CRAFTING) { @@ -212,7 +212,7 @@ public class GuiGrid extends GuiBase if (isHoveringOverClear(mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.storagecraft:clear")); + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); } } @@ -297,7 +297,7 @@ public class GuiGrid extends GuiBase if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) { - StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); } else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) { @@ -305,11 +305,11 @@ public class GuiGrid extends GuiBase boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); boolean one = clickedButton == 2; - StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); + RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); } else if (clickedClear) { - StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); } else { @@ -319,7 +319,7 @@ public class GuiGrid extends GuiBase { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); } } } diff --git a/src/main/java/storagecraft/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java similarity index 73% rename from src/main/java/storagecraft/gui/GuiHandler.java rename to src/main/java/refinedstorage/gui/GuiHandler.java index 4f04f3f2b..5fbf8b8ed 100644 --- a/src/main/java/storagecraft/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -1,4 +1,4 @@ -package storagecraft.gui; +package refinedstorage.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -6,10 +6,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import storagecraft.StorageCraftGUI; -import storagecraft.container.*; -import storagecraft.storage.IStorageGui; -import storagecraft.tile.*; +import refinedstorage.RefinedStorageGui; +import refinedstorage.container.*; +import refinedstorage.storage.IStorageGui; +import refinedstorage.tile.*; public class GuiHandler implements IGuiHandler { @@ -17,27 +17,27 @@ public class GuiHandler implements IGuiHandler { switch (ID) { - case StorageCraftGUI.CONTROLLER: + case RefinedStorageGui.CONTROLLER: return new ContainerController(player); - case StorageCraftGUI.GRID: + case RefinedStorageGui.GRID: return new ContainerGrid(player, (TileGrid) tile); - case StorageCraftGUI.DRIVE: + case RefinedStorageGui.DRIVE: return new ContainerDrive(player, (TileDrive) tile); - case StorageCraftGUI.IMPORTER: + case RefinedStorageGui.IMPORTER: return new ContainerImporter(player, (TileImporter) tile); - case StorageCraftGUI.EXPORTER: + case RefinedStorageGui.EXPORTER: return new ContainerExporter(player, (TileExporter) tile); - case StorageCraftGUI.DETECTOR: + case RefinedStorageGui.DETECTOR: return new ContainerDetector(player, (TileDetector) tile); - case StorageCraftGUI.SOLDERER: + case RefinedStorageGui.SOLDERER: return new ContainerSolderer(player, (TileSolderer) tile); - case StorageCraftGUI.WIRELESS_TRANSMITTER: + case RefinedStorageGui.WIRELESS_TRANSMITTER: return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); - case StorageCraftGUI.DESTRUCTOR: + case RefinedStorageGui.DESTRUCTOR: return new ContainerDestructor(player); - case StorageCraftGUI.CONSTRUCTOR: + case RefinedStorageGui.CONSTRUCTOR: return new ContainerConstructor(player, (TileConstructor) tile); - case StorageCraftGUI.STORAGE: + case RefinedStorageGui.STORAGE: return new ContainerStorage(player, ((IStorageGui) tile).getInventory()); default: return null; @@ -57,27 +57,27 @@ public class GuiHandler implements IGuiHandler switch (ID) { - case StorageCraftGUI.CONTROLLER: + case RefinedStorageGui.CONTROLLER: return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); - case StorageCraftGUI.GRID: + case RefinedStorageGui.GRID: return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); - case StorageCraftGUI.DRIVE: + case RefinedStorageGui.DRIVE: return new GuiDrive((ContainerDrive) getContainer(ID, player, tile), (TileDrive) tile); - case StorageCraftGUI.IMPORTER: + case RefinedStorageGui.IMPORTER: return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); - case StorageCraftGUI.EXPORTER: + case RefinedStorageGui.EXPORTER: return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); - case StorageCraftGUI.DETECTOR: + case RefinedStorageGui.DETECTOR: return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); - case StorageCraftGUI.SOLDERER: + case RefinedStorageGui.SOLDERER: return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); - case StorageCraftGUI.WIRELESS_TRANSMITTER: + case RefinedStorageGui.WIRELESS_TRANSMITTER: return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); - case StorageCraftGUI.DESTRUCTOR: + case RefinedStorageGui.DESTRUCTOR: return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); - case StorageCraftGUI.CONSTRUCTOR: + case RefinedStorageGui.CONSTRUCTOR: return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); - case StorageCraftGUI.STORAGE: + case RefinedStorageGui.STORAGE: return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); default: return null; diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java similarity index 66% rename from src/main/java/storagecraft/gui/GuiImporter.java rename to src/main/java/refinedstorage/gui/GuiImporter.java index 94de5af0c..398cd8757 100644 --- a/src/main/java/storagecraft/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -1,11 +1,11 @@ -package storagecraft.gui; +package refinedstorage.gui; -import storagecraft.container.ContainerImporter; -import storagecraft.gui.sidebutton.SideButtonCompare; -import storagecraft.gui.sidebutton.SideButtonMode; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileImporter; -import storagecraft.util.InventoryUtils; +import refinedstorage.container.ContainerImporter; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonMode; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileImporter; +import refinedstorage.util.InventoryUtils; public class GuiImporter extends GuiBase { @@ -45,7 +45,7 @@ public class GuiImporter extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:importer")); + drawString(7, 7, t("gui.refinedstorage:importer")); drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java similarity index 77% rename from src/main/java/storagecraft/gui/GuiSolderer.java rename to src/main/java/refinedstorage/gui/GuiSolderer.java index e7330a9f3..01903ac42 100644 --- a/src/main/java/storagecraft/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -1,8 +1,8 @@ -package storagecraft.gui; +package refinedstorage.gui; import net.minecraft.inventory.Container; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileSolderer; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileSolderer; public class GuiSolderer extends GuiBase { @@ -42,7 +42,7 @@ public class GuiSolderer extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:solderer")); + drawString(7, 7, t("gui.refinedstorage:solderer")); drawString(7, 82, t("container.inventory")); } } diff --git a/src/main/java/storagecraft/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java similarity index 74% rename from src/main/java/storagecraft/gui/GuiStorage.java rename to src/main/java/refinedstorage/gui/GuiStorage.java index dfd0593c9..6f314a5ac 100644 --- a/src/main/java/storagecraft/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -1,14 +1,14 @@ -package storagecraft.gui; +package refinedstorage.gui; import com.google.common.primitives.Ints; import java.io.IOException; import net.minecraft.client.gui.GuiTextField; -import storagecraft.container.ContainerStorage; -import storagecraft.gui.sidebutton.SideButtonCompare; -import storagecraft.gui.sidebutton.SideButtonMode; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.storage.IStorageGui; -import storagecraft.util.InventoryUtils; +import refinedstorage.container.ContainerStorage; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonMode; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.storage.IStorageGui; +import refinedstorage.util.InventoryUtils; public class GuiStorage extends GuiBase { @@ -79,20 +79,20 @@ public class GuiStorage extends GuiBase public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t(gui.getName())); - drawString(7, 42, t("misc.storagecraft:storage")); - drawString(115, 42, t("misc.storagecraft:priority")); + drawString(7, 42, t("misc.refinedstorage:storage")); + drawString(115, 42, t("misc.refinedstorage:priority")); drawString(7, 117, t("container.inventory")); - drawString(30, 54, t("misc.storagecraft:storage.stored", gui.getStored())); + drawString(30, 54, t("misc.refinedstorage:storage.stored", gui.getStored())); if (gui.getCapacity() != -1) { - drawString(30, 64, t("misc.storagecraft:storage.capacity", gui.getCapacity())); + drawString(30, 64, t("misc.refinedstorage:storage.capacity", gui.getCapacity())); } if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.storagecraft:storage.full", (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f))); + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f))); } } diff --git a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java similarity index 83% rename from src/main/java/storagecraft/gui/GuiWirelessTransmitter.java rename to src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index 9b792e622..530cf0681 100644 --- a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,8 +1,8 @@ -package storagecraft.gui; +package refinedstorage.gui; import net.minecraft.inventory.Container; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileWirelessTransmitter; +import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import refinedstorage.tile.TileWirelessTransmitter; public class GuiWirelessTransmitter extends GuiBase { @@ -44,7 +44,7 @@ public class GuiWirelessTransmitter extends GuiBase @Override public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.storagecraft:wireless_transmitter")); + drawString(7, 7, t("gui.refinedstorage:wireless_transmitter")); drawString(7, 43, t("container.inventory")); if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking()) diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButton.java b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java similarity index 80% rename from src/main/java/storagecraft/gui/sidebutton/SideButton.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButton.java index 885be5338..6a1de411d 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButton.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java @@ -1,6 +1,6 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; -import storagecraft.gui.GuiBase; +import refinedstorage.gui.GuiBase; public abstract class SideButton { diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java similarity index 60% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index 71bc72b29..9180ad1c3 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -1,11 +1,11 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageCompareUpdate; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageCompareUpdate; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.util.InventoryUtils; public class SideButtonCompare extends SideButton { @@ -23,15 +23,15 @@ public class SideButtonCompare extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:compare." + mask)).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n"); if ((setting.getCompare() & mask) == mask) { - builder.append(gui.t("misc.storagecraft:yes")); + builder.append(gui.t("misc.refinedstorage:yes")); } else { - builder.append(gui.t("misc.storagecraft:no")); + builder.append(gui.t("misc.refinedstorage:no")); } return builder.toString(); @@ -61,6 +61,6 @@ public class SideButtonCompare extends SideButton @Override public void actionPerformed() { - StorageCraft.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); + RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java similarity index 57% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index 941312747..f7da67f5b 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -1,12 +1,12 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageDetectorModeUpdate; -import storagecraft.tile.TileDetector; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageDetectorModeUpdate; +import refinedstorage.tile.TileDetector; public class SideButtonDetectorMode extends SideButton { @@ -22,9 +22,9 @@ public class SideButtonDetectorMode extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:detector.mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.storagecraft:detector.mode." + detector.getMode())); + builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); return builder.toString(); } @@ -38,6 +38,6 @@ public class SideButtonDetectorMode extends SideButton @Override public void actionPerformed() { - StorageCraft.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); + RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java similarity index 62% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java index 10751a27b..f0f49dc48 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -1,10 +1,10 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageGridSortingUpdate; -import storagecraft.tile.TileGrid; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageGridSortingUpdate; +import refinedstorage.tile.TileGrid; public class SideButtonGridSortingDirection extends SideButton { @@ -20,9 +20,9 @@ public class SideButtonGridSortingDirection extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.direction")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.storagecraft:sorting.direction." + grid.getSortingDirection())); + builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); return builder.toString(); } @@ -48,6 +48,6 @@ public class SideButtonGridSortingDirection extends SideButton dir = TileGrid.SORTING_DIRECTION_ASCENDING; } - StorageCraft.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java similarity index 61% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index b1ed1f9f5..7403bc4a8 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -1,10 +1,10 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageGridSortingUpdate; -import storagecraft.tile.TileGrid; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageGridSortingUpdate; +import refinedstorage.tile.TileGrid; public class SideButtonGridSortingType extends SideButton { @@ -20,9 +20,9 @@ public class SideButtonGridSortingType extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.type")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.storagecraft:sorting.type." + grid.getSortingType())); + builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); return builder.toString(); } @@ -48,6 +48,6 @@ public class SideButtonGridSortingType extends SideButton type = TileGrid.SORTING_TYPE_QUANTITY; } - StorageCraft.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java similarity index 57% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index bffab828d..a251b2992 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -1,10 +1,10 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageModeToggle; -import storagecraft.tile.settings.IModeSetting; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageModeToggle; +import refinedstorage.tile.settings.IModeSetting; public class SideButtonMode extends SideButton { @@ -20,9 +20,9 @@ public class SideButtonMode extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.storagecraft:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); + builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); return builder.toString(); } @@ -49,6 +49,6 @@ public class SideButtonMode extends SideButton @Override public void actionPerformed() { - StorageCraft.NETWORK.sendToServer(new MessageModeToggle(mode)); + RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); } } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java similarity index 50% rename from src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java index 277b758d7..82f92487a 100644 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -1,10 +1,10 @@ -package storagecraft.gui.sidebutton; +package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import storagecraft.StorageCraft; -import storagecraft.gui.GuiBase; -import storagecraft.network.MessageRedstoneModeUpdate; -import storagecraft.tile.settings.IRedstoneModeSetting; +import refinedstorage.RefinedStorage; +import refinedstorage.gui.GuiBase; +import refinedstorage.network.MessageRedstoneModeUpdate; +import refinedstorage.tile.settings.IRedstoneModeSetting; public class SideButtonRedstoneMode extends SideButton { @@ -20,9 +20,9 @@ public class SideButtonRedstoneMode extends SideButton { StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.RED).append(gui.t("sidebutton.storagecraft:redstone_mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.storagecraft:redstone_mode." + setting.getRedstoneMode().id)); + builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); return builder.toString(); } @@ -37,6 +37,6 @@ public class SideButtonRedstoneMode extends SideButton @Override public void actionPerformed() { - StorageCraft.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); + RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); } } diff --git a/src/main/java/storagecraft/inventory/InventorySimple.java b/src/main/java/refinedstorage/inventory/InventorySimple.java similarity index 98% rename from src/main/java/storagecraft/inventory/InventorySimple.java rename to src/main/java/refinedstorage/inventory/InventorySimple.java index 036db272b..0b76fb949 100644 --- a/src/main/java/storagecraft/inventory/InventorySimple.java +++ b/src/main/java/refinedstorage/inventory/InventorySimple.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package refinedstorage.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/storagecraft/item/ItemBase.java b/src/main/java/refinedstorage/item/ItemBase.java similarity index 74% rename from src/main/java/storagecraft/item/ItemBase.java rename to src/main/java/refinedstorage/item/ItemBase.java index ae9902aa4..48f25c383 100644 --- a/src/main/java/storagecraft/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -1,8 +1,8 @@ -package storagecraft.item; +package refinedstorage.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraft; +import refinedstorage.RefinedStorage; public abstract class ItemBase extends Item { @@ -12,13 +12,13 @@ public abstract class ItemBase extends Item { this.name = name; - setCreativeTab(StorageCraft.TAB); + setCreativeTab(RefinedStorage.TAB); } @Override public String getUnlocalizedName() { - return "item." + StorageCraft.ID + ":" + name; + return "item." + RefinedStorage.ID + ":" + name; } @Override diff --git a/src/main/java/storagecraft/item/ItemBlockBase.java b/src/main/java/refinedstorage/item/ItemBlockBase.java similarity index 92% rename from src/main/java/storagecraft/item/ItemBlockBase.java rename to src/main/java/refinedstorage/item/ItemBlockBase.java index 5ecd34873..338e83026 100644 --- a/src/main/java/storagecraft/item/ItemBlockBase.java +++ b/src/main/java/refinedstorage/item/ItemBlockBase.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import net.minecraft.block.Block; import net.minecraft.item.ItemColored; diff --git a/src/main/java/storagecraft/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java similarity index 84% rename from src/main/java/storagecraft/item/ItemBlockController.java rename to src/main/java/refinedstorage/item/ItemBlockController.java index c40971830..73d0e4843 100644 --- a/src/main/java/storagecraft/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import net.minecraft.block.Block; diff --git a/src/main/java/storagecraft/item/ItemBlockGrid.java b/src/main/java/refinedstorage/item/ItemBlockGrid.java similarity index 78% rename from src/main/java/storagecraft/item/ItemBlockGrid.java rename to src/main/java/refinedstorage/item/ItemBlockGrid.java index 028ba764c..3a13a1114 100644 --- a/src/main/java/storagecraft/item/ItemBlockGrid.java +++ b/src/main/java/refinedstorage/item/ItemBlockGrid.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import net.minecraft.block.Block; diff --git a/src/main/java/storagecraft/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java similarity index 71% rename from src/main/java/storagecraft/item/ItemBlockStorage.java rename to src/main/java/refinedstorage/item/ItemBlockStorage.java index 19e16699c..0d4cb264a 100644 --- a/src/main/java/storagecraft/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.block.Block; @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import storagecraft.block.EnumStorageType; -import storagecraft.storage.NBTStorage; -import storagecraft.tile.TileStorage; +import refinedstorage.block.EnumStorageType; +import refinedstorage.storage.NBTStorage; +import refinedstorage.tile.TileStorage; public class ItemBlockStorage extends ItemBlockBase { @@ -29,11 +29,11 @@ public class ItemBlockStorage extends ItemBlockBase if (type == EnumStorageType.TYPE_CREATIVE) { - list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(tag))); + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag))); } else { - list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); } } } diff --git a/src/main/java/storagecraft/item/ItemCore.java b/src/main/java/refinedstorage/item/ItemCore.java similarity index 94% rename from src/main/java/storagecraft/item/ItemCore.java rename to src/main/java/refinedstorage/item/ItemCore.java index 578e2fc7e..376400daf 100644 --- a/src/main/java/storagecraft/item/ItemCore.java +++ b/src/main/java/refinedstorage/item/ItemCore.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/storagecraft/item/ItemProcessor.java b/src/main/java/refinedstorage/item/ItemProcessor.java similarity index 96% rename from src/main/java/storagecraft/item/ItemProcessor.java rename to src/main/java/refinedstorage/item/ItemProcessor.java index 9e7d159bd..fa7c442be 100644 --- a/src/main/java/storagecraft/item/ItemProcessor.java +++ b/src/main/java/refinedstorage/item/ItemProcessor.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/storagecraft/item/ItemQuartzEnrichedIron.java b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java similarity index 77% rename from src/main/java/storagecraft/item/ItemQuartzEnrichedIron.java rename to src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java index 3397b005b..1cb33b031 100644 --- a/src/main/java/storagecraft/item/ItemQuartzEnrichedIron.java +++ b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; public class ItemQuartzEnrichedIron extends ItemBase { diff --git a/src/main/java/storagecraft/item/ItemSilicon.java b/src/main/java/refinedstorage/item/ItemSilicon.java similarity index 71% rename from src/main/java/storagecraft/item/ItemSilicon.java rename to src/main/java/refinedstorage/item/ItemSilicon.java index 75648d15a..d6cd6dce3 100644 --- a/src/main/java/storagecraft/item/ItemSilicon.java +++ b/src/main/java/refinedstorage/item/ItemSilicon.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; public class ItemSilicon extends ItemBase { diff --git a/src/main/java/storagecraft/item/ItemStorageCell.java b/src/main/java/refinedstorage/item/ItemStorageCell.java similarity index 73% rename from src/main/java/storagecraft/item/ItemStorageCell.java rename to src/main/java/refinedstorage/item/ItemStorageCell.java index 1c740e041..78f809f17 100644 --- a/src/main/java/storagecraft/item/ItemStorageCell.java +++ b/src/main/java/refinedstorage/item/ItemStorageCell.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -7,8 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import storagecraft.storage.CellStorage; -import storagecraft.storage.NBTStorage; +import refinedstorage.storage.CellStorage; +import refinedstorage.storage.NBTStorage; public class ItemStorageCell extends ItemBase { @@ -41,11 +41,11 @@ public class ItemStorageCell extends ItemBase { if (CellStorage.getCapacity(cell) == -1) { - list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); } else { - list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); } } diff --git a/src/main/java/storagecraft/item/ItemStoragePart.java b/src/main/java/refinedstorage/item/ItemStoragePart.java similarity index 95% rename from src/main/java/storagecraft/item/ItemStoragePart.java rename to src/main/java/refinedstorage/item/ItemStoragePart.java index 31e243463..0f282b5c9 100644 --- a/src/main/java/storagecraft/item/ItemStoragePart.java +++ b/src/main/java/refinedstorage/item/ItemStoragePart.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/storagecraft/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java similarity index 79% rename from src/main/java/storagecraft/item/ItemWirelessGrid.java rename to src/main/java/refinedstorage/item/ItemWirelessGrid.java index 71bba0108..19d25cbb4 100644 --- a/src/main/java/storagecraft/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -13,11 +13,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftGUI; -import storagecraft.block.EnumGridType; -import storagecraft.tile.TileGrid; -import storagecraft.tile.TileWirelessTransmitter; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageGui; +import refinedstorage.block.EnumGridType; +import refinedstorage.tile.TileGrid; +import refinedstorage.tile.TileWirelessTransmitter; public class ItemWirelessGrid extends ItemBase { @@ -46,7 +46,7 @@ public class ItemWirelessGrid extends ItemBase { if (isValid(stack)) { - list.add(I18n.translateToLocalFormatted("misc.storagecraft:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); } } @@ -75,33 +75,33 @@ public class ItemWirelessGrid extends ItemBase if (grid == null) { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage()))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage()))); } else { - player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); return new ActionResult(EnumActionResult.SUCCESS, stack); } } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_working"))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working"))); } } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_found"))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); } } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.out_of_range"))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); } } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage()))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage()))); } return new ActionResult(EnumActionResult.FAIL, stack); diff --git a/src/main/java/storagecraft/item/ItemWirelessGridPlate.java b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java similarity index 78% rename from src/main/java/storagecraft/item/ItemWirelessGridPlate.java rename to src/main/java/refinedstorage/item/ItemWirelessGridPlate.java index 9ef561052..89187280d 100644 --- a/src/main/java/storagecraft/item/ItemWirelessGridPlate.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java @@ -1,4 +1,4 @@ -package storagecraft.item; +package refinedstorage.item; public class ItemWirelessGridPlate extends ItemBase { diff --git a/src/main/java/storagecraft/jei/PluginStorageCraft.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java similarity index 55% rename from src/main/java/storagecraft/jei/PluginStorageCraft.java rename to src/main/java/refinedstorage/jei/PluginRefinedStorage.java index 6098dd4c5..cf9898e12 100644 --- a/src/main/java/storagecraft/jei/PluginStorageCraft.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -1,16 +1,16 @@ -package storagecraft.jei; +package refinedstorage.jei; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.storage.CellStorage; -import storagecraft.tile.TileStorage; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.storage.CellStorage; +import refinedstorage.tile.TileStorage; @JEIPlugin -public class PluginStorageCraft extends BlankModPlugin +public class PluginRefinedStorage extends BlankModPlugin { @Override public void register(IModRegistry registry) @@ -21,7 +21,7 @@ public class PluginStorageCraft extends BlankModPlugin registry.addRecipes(SoldererRecipeMaker.getRecipes()); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(StorageCraftItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), TileStorage.NBT_STORAGE); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); } } diff --git a/src/main/java/storagecraft/jei/SoldererRecipeCategory.java b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java similarity index 81% rename from src/main/java/storagecraft/jei/SoldererRecipeCategory.java rename to src/main/java/refinedstorage/jei/SoldererRecipeCategory.java index 0d25a3b4f..16bf847f3 100644 --- a/src/main/java/storagecraft/jei/SoldererRecipeCategory.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java @@ -1,4 +1,4 @@ -package storagecraft.jei; +package refinedstorage.jei; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; @@ -17,19 +17,19 @@ public class SoldererRecipeCategory implements IRecipeCategory public SoldererRecipeCategory(IGuiHelper helper) { - background = helper.createDrawable(new ResourceLocation("storagecraft", "textures/gui/solderer.png"), 8, 5, 162, 89); + background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89); } @Override public String getUid() { - return "storagecraft.solderer"; + return "refinedstorage.solderer"; } @Override public String getTitle() { - return I18n.translateToLocal("gui.storagecraft:solderer"); + return I18n.translateToLocal("gui.refinedstorage:solderer"); } @Override diff --git a/src/main/java/storagecraft/jei/SoldererRecipeHandler.java b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java similarity index 85% rename from src/main/java/storagecraft/jei/SoldererRecipeHandler.java rename to src/main/java/refinedstorage/jei/SoldererRecipeHandler.java index d33902be5..86e95b3e5 100644 --- a/src/main/java/storagecraft/jei/SoldererRecipeHandler.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java @@ -1,4 +1,4 @@ -package storagecraft.jei; +package refinedstorage.jei; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; @@ -14,7 +14,7 @@ public class SoldererRecipeHandler implements IRecipeHandler implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java similarity index 94% rename from src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java rename to src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java index 08e5912a4..c097cb0d8 100644 --- a/src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java @@ -1,11 +1,11 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.TileDetector; +import refinedstorage.tile.TileDetector; public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageDetectorModeUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java similarity index 95% rename from src/main/java/storagecraft/network/MessageDetectorModeUpdate.java rename to src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java index 6072f4b82..5c5e2a9b9 100644 --- a/src/main/java/storagecraft/network/MessageDetectorModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java @@ -1,11 +1,11 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.TileDetector; +import refinedstorage.tile.TileDetector; public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageGridCraftingClear.java b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java similarity index 93% rename from src/main/java/storagecraft/network/MessageGridCraftingClear.java rename to src/main/java/refinedstorage/network/MessageGridCraftingClear.java index a3e28d032..6b13bac1c 100644 --- a/src/main/java/storagecraft/network/MessageGridCraftingClear.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.block.EnumGridType; -import storagecraft.tile.TileGrid; +import refinedstorage.block.EnumGridType; +import refinedstorage.tile.TileGrid; public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageGridCraftingUpdate.java b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java similarity index 96% rename from src/main/java/storagecraft/network/MessageGridCraftingUpdate.java rename to src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java index 8de0b9ab8..78f1b133e 100644 --- a/src/main/java/storagecraft/network/MessageGridCraftingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import storagecraft.tile.TileGrid; +import refinedstorage.tile.TileGrid; public class MessageGridCraftingUpdate implements IMessage, IMessageHandler { diff --git a/src/main/java/storagecraft/network/MessageGridSortingUpdate.java b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java similarity index 92% rename from src/main/java/storagecraft/network/MessageGridSortingUpdate.java rename to src/main/java/refinedstorage/network/MessageGridSortingUpdate.java index 98bc0675e..1f2ac8f42 100644 --- a/src/main/java/storagecraft/network/MessageGridSortingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java @@ -1,11 +1,11 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.TileGrid; +import refinedstorage.tile.TileGrid; public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageHandlerPlayerToServer.java b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java similarity index 95% rename from src/main/java/storagecraft/network/MessageHandlerPlayerToServer.java rename to src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java index 4408bd0c5..2c6c1bc44 100644 --- a/src/main/java/storagecraft/network/MessageHandlerPlayerToServer.java +++ b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/storagecraft/network/MessageModeToggle.java b/src/main/java/refinedstorage/network/MessageModeToggle.java similarity index 93% rename from src/main/java/storagecraft/network/MessageModeToggle.java rename to src/main/java/refinedstorage/network/MessageModeToggle.java index e9084955d..0085479cf 100644 --- a/src/main/java/storagecraft/network/MessageModeToggle.java +++ b/src/main/java/refinedstorage/network/MessageModeToggle.java @@ -1,11 +1,11 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IModeSetting; public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessagePriorityUpdate.java b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java similarity index 89% rename from src/main/java/storagecraft/network/MessagePriorityUpdate.java rename to src/main/java/refinedstorage/network/MessagePriorityUpdate.java index c2c590329..16a648e51 100644 --- a/src/main/java/storagecraft/network/MessagePriorityUpdate.java +++ b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java @@ -1,13 +1,13 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.TileDrive; -import storagecraft.tile.TileExternalStorage; -import storagecraft.tile.TileStorage; +import refinedstorage.tile.TileDrive; +import refinedstorage.tile.TileExternalStorage; +import refinedstorage.tile.TileStorage; public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java similarity index 93% rename from src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java rename to src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java index 316a2a23f..9e12224b4 100644 --- a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java @@ -1,11 +1,11 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.settings.IRedstoneModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java similarity index 95% rename from src/main/java/storagecraft/network/MessageStoragePull.java rename to src/main/java/refinedstorage/network/MessageStoragePull.java index 91857d8c1..7dcff78b0 100644 --- a/src/main/java/storagecraft/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.storage.StorageItem; -import storagecraft.tile.TileController; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.TileController; public class MessageStoragePull extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageStoragePush.java b/src/main/java/refinedstorage/network/MessageStoragePush.java similarity index 96% rename from src/main/java/storagecraft/network/MessageStoragePush.java rename to src/main/java/refinedstorage/network/MessageStoragePush.java index bfa4be83c..915d512d2 100644 --- a/src/main/java/storagecraft/network/MessageStoragePush.java +++ b/src/main/java/refinedstorage/network/MessageStoragePush.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import storagecraft.tile.TileController; +import refinedstorage.tile.TileController; public class MessageStoragePush extends MessageHandlerPlayerToServer implements IMessage { diff --git a/src/main/java/storagecraft/network/MessageTileUpdate.java b/src/main/java/refinedstorage/network/MessageTileUpdate.java similarity index 94% rename from src/main/java/storagecraft/network/MessageTileUpdate.java rename to src/main/java/refinedstorage/network/MessageTileUpdate.java index 9a487d613..10986a3d1 100644 --- a/src/main/java/storagecraft/network/MessageTileUpdate.java +++ b/src/main/java/refinedstorage/network/MessageTileUpdate.java @@ -1,4 +1,4 @@ -package storagecraft.network; +package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; @@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import storagecraft.tile.INetworkTile; +import refinedstorage.tile.INetworkTile; public class MessageTileUpdate implements IMessage, IMessageHandler { diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java new file mode 100644 index 000000000..dff878db1 --- /dev/null +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -0,0 +1,134 @@ +package refinedstorage.proxy; + +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.block.*; +import refinedstorage.item.*; + +public class ClientProxy extends CommonProxy +{ + @Override + public void preInit(FMLPreInitializationEvent e) + { + super.preInit(e); + + // Item Variants + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL, + new ResourceLocation("refinedstorage:1k_storage_cell"), + new ResourceLocation("refinedstorage:4k_storage_cell"), + new ResourceLocation("refinedstorage:16k_storage_cell"), + new ResourceLocation("refinedstorage:64k_storage_cell"), + new ResourceLocation("refinedstorage:creative_storage_cell") + ); + + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, + new ResourceLocation("refinedstorage:1k_storage_part"), + new ResourceLocation("refinedstorage:4k_storage_part"), + new ResourceLocation("refinedstorage:16k_storage_part"), + new ResourceLocation("refinedstorage:64k_storage_part") + ); + + ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, + new ResourceLocation("refinedstorage:basic_printed_processor"), + new ResourceLocation("refinedstorage:improved_printed_processor"), + new ResourceLocation("refinedstorage:advanced_printed_processor"), + new ResourceLocation("refinedstorage:basic_processor"), + new ResourceLocation("refinedstorage:improved_processor"), + new ResourceLocation("refinedstorage:advanced_processor"), + new ResourceLocation("refinedstorage:printed_silicon") + ); + + ModelBakery.registerItemVariants(RefinedStorageItems.CORE, + new ResourceLocation("refinedstorage:construction_core"), + new ResourceLocation("refinedstorage:destruction_core") + ); + + ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID, + new ResourceLocation("refinedstorage:wireless_grid_connected"), + new ResourceLocation("refinedstorage:wireless_grid_disconnected") + ); + + // Items + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory")); + + ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() + { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + if (ItemWirelessGrid.isValid(stack)) + { + return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory"); + } + else + { + return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory"); + } + } + }); + + // Blocks + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DRIVE), 0, new ModelResourceLocation("refinedstorage:drive", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); + + ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) + .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) + .ignore(RefinedStorageBlocks.STORAGE.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")); + } +} diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java new file mode 100644 index 000000000..a8fe0762c --- /dev/null +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -0,0 +1,355 @@ +package refinedstorage.proxy; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.block.*; +import refinedstorage.gui.GuiHandler; +import refinedstorage.item.*; +import refinedstorage.network.*; +import refinedstorage.storage.NBTStorage; +import refinedstorage.tile.*; +import refinedstorage.tile.solderer.*; + +public class CommonProxy +{ + public void preInit(FMLPreInitializationEvent e) + { + RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); + RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); + + NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); + + GameRegistry.registerTileEntity(TileController.class, "controller"); + GameRegistry.registerTileEntity(TileCable.class, "cable"); + GameRegistry.registerTileEntity(TileGrid.class, "grid"); + GameRegistry.registerTileEntity(TileDrive.class, "drive"); + GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); + GameRegistry.registerTileEntity(TileImporter.class, "importer"); + GameRegistry.registerTileEntity(TileExporter.class, "exporter"); + GameRegistry.registerTileEntity(TileDetector.class, "detector"); + GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); + GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); + GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); + GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); + GameRegistry.registerTileEntity(TileStorage.class, "storage"); + + GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller"); + GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable"); + GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid"); + GameRegistry.registerBlock(RefinedStorageBlocks.DRIVE, "drive"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector"); + GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing"); + GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer"); + GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage"); + + GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); + GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); + GameRegistry.registerItem(RefinedStorageItems.CORE, "core"); + GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon"); + GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part"); + + // Processors + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); + + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); + + // Silicon + GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f); + + // Quartz Enriched Iron + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4), + "II", + "IQ", + 'I', new ItemStack(Items.iron_ingot), + 'Q', new ItemStack(Items.quartz) + ); + + // Machine Casing + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + "EEE", + "E E", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + // Construction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.glowstone_dust) + ); + + // Destruction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.quartz) + ); + + // Controller + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), + "EDE", + "SRS", + "ESE", + 'D', new ItemStack(Items.diamond), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'S', new ItemStack(RefinedStorageItems.SILICON) + ); + + // Solderer + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER), + "ESE", + "E E", + "ESE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'S', new ItemStack(Blocks.sticky_piston) + ); + + // Drive + SoldererRegistry.addRecipe(new SoldererRecipeDrive()); + + // Cable + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6), + "EEE", + "GRG", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone) + ); + + // Grid + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()), + "ECE", + "PMP", + "EDE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) + ); + + // Crafting Grid + SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); + + // Wireless Transmitter + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER), + "EPE", + "EME", + "EAE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'P', new ItemStack(Items.ender_pearl), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) + ); + + // Wireless Grid Plate + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE), + " P ", + "ERE", + "EEE", + 'P', new ItemStack(Items.ender_pearl), + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + // Wireless Grid + SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); + SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); + + // External Storage + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), + "CED", + "HMH", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'H', new ItemStack(Blocks.chest), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); + + // Importer + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); + + // Exporter + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); + + // Destructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR), + "EDE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); + + // Constructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR), + "ECE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); + + // Detector + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR), + "ECE", + "RMR", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'C', new ItemStack(Items.comparator), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); + + // Storage Cell Parts + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.SILICON), + 'S', new ItemStack(Blocks.glass) + ); + + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) + ); + + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) + ); + + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) + ); + + // Storage Cells + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + + // Storage Blocks + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); + } + + public void init(FMLInitializationEvent e) + { + } + + public void postInit(FMLPostInitializationEvent e) + { + } +} diff --git a/src/main/java/storagecraft/proxy/ServerProxy.java b/src/main/java/refinedstorage/proxy/ServerProxy.java similarity index 58% rename from src/main/java/storagecraft/proxy/ServerProxy.java rename to src/main/java/refinedstorage/proxy/ServerProxy.java index 90eea4f46..f1494c722 100644 --- a/src/main/java/storagecraft/proxy/ServerProxy.java +++ b/src/main/java/refinedstorage/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package storagecraft.proxy; +package refinedstorage.proxy; public class ServerProxy extends CommonProxy { diff --git a/src/main/java/storagecraft/storage/CellStorage.java b/src/main/java/refinedstorage/storage/CellStorage.java similarity index 88% rename from src/main/java/storagecraft/storage/CellStorage.java rename to src/main/java/refinedstorage/storage/CellStorage.java index e8e749f12..dfbc31b5a 100644 --- a/src/main/java/storagecraft/storage/CellStorage.java +++ b/src/main/java/refinedstorage/storage/CellStorage.java @@ -1,7 +1,7 @@ -package storagecraft.storage; +package refinedstorage.storage; import net.minecraft.item.ItemStack; -import storagecraft.item.ItemStorageCell; +import refinedstorage.item.ItemStorageCell; public class CellStorage extends NBTStorage { diff --git a/src/main/java/storagecraft/storage/IStorage.java b/src/main/java/refinedstorage/storage/IStorage.java similarity index 86% rename from src/main/java/storagecraft/storage/IStorage.java rename to src/main/java/refinedstorage/storage/IStorage.java index 96c9bf347..43459e1f0 100644 --- a/src/main/java/storagecraft/storage/IStorage.java +++ b/src/main/java/refinedstorage/storage/IStorage.java @@ -1,4 +1,4 @@ -package storagecraft.storage; +package refinedstorage.storage; import java.util.List; import net.minecraft.item.ItemStack; diff --git a/src/main/java/storagecraft/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java similarity index 69% rename from src/main/java/storagecraft/storage/IStorageGui.java rename to src/main/java/refinedstorage/storage/IStorageGui.java index a7943e65e..3b015ab9b 100644 --- a/src/main/java/storagecraft/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -1,9 +1,9 @@ -package storagecraft.storage; +package refinedstorage.storage; import net.minecraft.inventory.IInventory; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.tile.settings.IModeSetting; -import storagecraft.tile.settings.IRedstoneModeSetting; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; public interface IStorageGui { diff --git a/src/main/java/storagecraft/storage/IStorageProvider.java b/src/main/java/refinedstorage/storage/IStorageProvider.java similarity index 74% rename from src/main/java/storagecraft/storage/IStorageProvider.java rename to src/main/java/refinedstorage/storage/IStorageProvider.java index 2691549ae..678d7e823 100644 --- a/src/main/java/storagecraft/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/storage/IStorageProvider.java @@ -1,4 +1,4 @@ -package storagecraft.storage; +package refinedstorage.storage; import java.util.List; diff --git a/src/main/java/storagecraft/storage/NBTStorage.java b/src/main/java/refinedstorage/storage/NBTStorage.java similarity index 99% rename from src/main/java/storagecraft/storage/NBTStorage.java rename to src/main/java/refinedstorage/storage/NBTStorage.java index 904c0c08d..e3ad6eb28 100644 --- a/src/main/java/storagecraft/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/storage/NBTStorage.java @@ -1,4 +1,4 @@ -package storagecraft.storage; +package refinedstorage.storage; import java.util.List; import net.minecraft.item.Item; diff --git a/src/main/java/storagecraft/storage/StorageItem.java b/src/main/java/refinedstorage/storage/StorageItem.java similarity index 98% rename from src/main/java/storagecraft/storage/StorageItem.java rename to src/main/java/refinedstorage/storage/StorageItem.java index bf253dc96..3f0ff9b73 100644 --- a/src/main/java/storagecraft/storage/StorageItem.java +++ b/src/main/java/refinedstorage/storage/StorageItem.java @@ -1,4 +1,4 @@ -package storagecraft.storage; +package refinedstorage.storage; import io.netty.buffer.ByteBuf; import net.minecraft.item.Item; @@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import storagecraft.util.InventoryUtils; +import refinedstorage.util.InventoryUtils; public class StorageItem { diff --git a/src/main/java/storagecraft/tile/INetworkTile.java b/src/main/java/refinedstorage/tile/INetworkTile.java similarity index 88% rename from src/main/java/storagecraft/tile/INetworkTile.java rename to src/main/java/refinedstorage/tile/INetworkTile.java index 438d43b57..6773230c0 100644 --- a/src/main/java/storagecraft/tile/INetworkTile.java +++ b/src/main/java/refinedstorage/tile/INetworkTile.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/storagecraft/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java similarity index 91% rename from src/main/java/storagecraft/tile/TileBase.java rename to src/main/java/refinedstorage/tile/TileBase.java index aa048eba5..d55a17a04 100644 --- a/src/main/java/storagecraft/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.IInventory; @@ -12,8 +12,8 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; -import storagecraft.StorageCraft; -import storagecraft.network.MessageTileUpdate; +import refinedstorage.RefinedStorage; +import refinedstorage.network.MessageTileUpdate; public abstract class TileBase extends TileEntity implements ITickable { @@ -36,7 +36,7 @@ public abstract class TileBase extends TileEntity implements ITickable { TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - StorageCraft.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); + RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); } } } diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java similarity index 98% rename from src/main/java/storagecraft/tile/TileCable.java rename to src/main/java/refinedstorage/tile/TileCable.java index 9474b0b34..020e703d3 100644 --- a/src/main/java/storagecraft/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import java.util.List; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/storagecraft/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java similarity index 91% rename from src/main/java/storagecraft/tile/TileConstructor.java rename to src/main/java/refinedstorage/tile/TileConstructor.java index d4dcbdd86..9ba0590dc 100644 --- a/src/main/java/storagecraft/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; @@ -6,9 +6,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; -import storagecraft.inventory.InventorySimple; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.util.InventoryUtils; public class TileConstructor extends TileMachine implements ICompareSetting { diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java similarity index 92% rename from src/main/java/storagecraft/tile/TileController.java rename to src/main/java/refinedstorage/tile/TileController.java index 63ca4eed3..dd7507951 100644 --- a/src/main/java/storagecraft/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; @@ -11,15 +11,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import storagecraft.StorageCraftBlocks; -import storagecraft.block.BlockController; -import storagecraft.block.EnumControllerType; -import storagecraft.storage.IStorage; -import storagecraft.storage.IStorageProvider; -import storagecraft.storage.StorageItem; -import storagecraft.tile.settings.IRedstoneModeSetting; -import storagecraft.tile.settings.RedstoneMode; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.block.BlockController; +import refinedstorage.block.EnumControllerType; +import refinedstorage.storage.IStorage; +import refinedstorage.storage.IStorageProvider; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.tile.settings.RedstoneMode; +import refinedstorage.util.InventoryUtils; public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting { @@ -132,7 +132,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (lastEnergy != energy.getEnergyStored()) { - worldObj.updateComparatorOutputLevel(pos, StorageCraftBlocks.CONTROLLER); + worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); } } } @@ -140,7 +140,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor public EnumControllerType getType() { - if (worldObj.getBlockState(pos).getBlock() == StorageCraftBlocks.CONTROLLER) + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) { return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); } diff --git a/src/main/java/storagecraft/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java similarity index 92% rename from src/main/java/storagecraft/tile/TileDestructor.java rename to src/main/java/refinedstorage/tile/TileDestructor.java index 60f2cf150..a9ec2a100 100644 --- a/src/main/java/storagecraft/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -1,11 +1,11 @@ -package storagecraft.tile; +package refinedstorage.tile; import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import storagecraft.util.InventoryUtils; +import refinedstorage.util.InventoryUtils; public class TileDestructor extends TileMachine { diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java similarity index 91% rename from src/main/java/storagecraft/tile/TileDetector.java rename to src/main/java/refinedstorage/tile/TileDetector.java index 16306cc8d..9f8378aaa 100644 --- a/src/main/java/storagecraft/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -1,14 +1,14 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import storagecraft.StorageCraftBlocks; -import storagecraft.inventory.InventorySimple; -import storagecraft.storage.StorageItem; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.util.InventoryUtils; public class TileDetector extends TileMachine implements ICompareSetting { @@ -106,7 +106,7 @@ public class TileDetector extends TileMachine implements ICompareSetting if (powered != lastPowered) { - worldObj.notifyNeighborsOfStateChange(pos, StorageCraftBlocks.DETECTOR); + worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); } } } diff --git a/src/main/java/storagecraft/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java similarity index 93% rename from src/main/java/storagecraft/tile/TileDrive.java rename to src/main/java/refinedstorage/tile/TileDrive.java index 3064d0875..e56826c10 100644 --- a/src/main/java/storagecraft/tile/TileDrive.java +++ b/src/main/java/refinedstorage/tile/TileDrive.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import java.util.List; @@ -7,11 +7,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; -import storagecraft.inventory.InventorySimple; -import storagecraft.storage.CellStorage; -import storagecraft.storage.IStorage; -import storagecraft.storage.IStorageProvider; -import storagecraft.util.InventoryUtils; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.storage.CellStorage; +import refinedstorage.storage.IStorage; +import refinedstorage.storage.IStorageProvider; +import refinedstorage.util.InventoryUtils; public class TileDrive extends TileMachine implements IInventory, IStorageProvider { diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java similarity index 94% rename from src/main/java/storagecraft/tile/TileExporter.java rename to src/main/java/refinedstorage/tile/TileExporter.java index 60824dbd6..11282380a 100644 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; @@ -6,9 +6,9 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import storagecraft.inventory.InventorySimple; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.util.InventoryUtils; public class TileExporter extends TileMachine implements ICompareSetting { diff --git a/src/main/java/storagecraft/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java similarity index 88% rename from src/main/java/storagecraft/tile/TileExternalStorage.java rename to src/main/java/refinedstorage/tile/TileExternalStorage.java index 2719d9fc0..82f7f5625 100644 --- a/src/main/java/storagecraft/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import java.util.List; @@ -8,17 +8,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import storagecraft.StorageCraft; -import storagecraft.inventory.InventorySimple; -import storagecraft.network.MessagePriorityUpdate; -import storagecraft.storage.IStorage; -import storagecraft.storage.IStorageGui; -import storagecraft.storage.IStorageProvider; -import storagecraft.storage.StorageItem; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.tile.settings.IModeSetting; -import storagecraft.tile.settings.IRedstoneModeSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.network.MessagePriorityUpdate; +import refinedstorage.storage.IStorage; +import refinedstorage.storage.IStorageGui; +import refinedstorage.storage.IStorageProvider; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.util.InventoryUtils; public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { @@ -263,7 +263,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public String getName() { - return "gui.storagecraft:external_storage"; + return "gui.refinedstorage:external_storage"; } @Override @@ -315,7 +315,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void onPriorityChanged(int priority) { - StorageCraft.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); } }; } diff --git a/src/main/java/storagecraft/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java similarity index 90% rename from src/main/java/storagecraft/tile/TileGrid.java rename to src/main/java/refinedstorage/tile/TileGrid.java index 367ef5729..6fbda9b11 100644 --- a/src/main/java/storagecraft/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; @@ -9,13 +9,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; -import storagecraft.StorageCraft; -import storagecraft.block.BlockGrid; -import storagecraft.block.EnumGridType; -import storagecraft.inventory.InventorySimple; -import storagecraft.network.MessageGridCraftingUpdate; -import storagecraft.storage.StorageItem; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.block.BlockGrid; +import refinedstorage.block.EnumGridType; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.network.MessageGridCraftingUpdate; +import refinedstorage.storage.StorageItem; +import refinedstorage.util.InventoryUtils; public class TileGrid extends TileMachine { @@ -107,7 +107,7 @@ public class TileGrid extends TileMachine TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - StorageCraft.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); + RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); } } diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java similarity index 94% rename from src/main/java/storagecraft/tile/TileImporter.java rename to src/main/java/refinedstorage/tile/TileImporter.java index 54a8eb3ae..4f42538b4 100644 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; @@ -6,10 +6,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import storagecraft.inventory.InventorySimple; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.tile.settings.IModeSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.util.InventoryUtils; public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting { diff --git a/src/main/java/storagecraft/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java similarity index 94% rename from src/main/java/storagecraft/tile/TileMachine.java rename to src/main/java/refinedstorage/tile/TileMachine.java index ddfbf8b41..48398c916 100644 --- a/src/main/java/storagecraft/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -1,12 +1,12 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; -import storagecraft.block.BlockMachine; -import storagecraft.tile.settings.IRedstoneModeSetting; -import storagecraft.tile.settings.RedstoneMode; +import refinedstorage.block.BlockMachine; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.tile.settings.RedstoneMode; public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { diff --git a/src/main/java/storagecraft/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java similarity index 95% rename from src/main/java/storagecraft/tile/TileSolderer.java rename to src/main/java/refinedstorage/tile/TileSolderer.java index 7667ce561..59110ab69 100644 --- a/src/main/java/storagecraft/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; @@ -10,10 +10,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import storagecraft.inventory.InventorySimple; -import storagecraft.tile.solderer.ISoldererRecipe; -import storagecraft.tile.solderer.SoldererRegistry; -import storagecraft.util.InventoryUtils; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.solderer.ISoldererRecipe; +import refinedstorage.tile.solderer.SoldererRegistry; +import refinedstorage.util.InventoryUtils; public class TileSolderer extends TileMachine implements IInventory, ISidedInventory { diff --git a/src/main/java/storagecraft/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java similarity index 82% rename from src/main/java/storagecraft/tile/TileStorage.java rename to src/main/java/refinedstorage/tile/TileStorage.java index 3c3dd7080..431051f83 100644 --- a/src/main/java/storagecraft/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import java.util.List; @@ -7,20 +7,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import storagecraft.StorageCraft; -import storagecraft.block.BlockStorage; -import storagecraft.block.EnumStorageType; -import storagecraft.inventory.InventorySimple; -import storagecraft.network.MessagePriorityUpdate; -import storagecraft.storage.IStorage; -import storagecraft.storage.IStorageGui; -import storagecraft.storage.IStorageProvider; -import storagecraft.storage.NBTStorage; -import storagecraft.storage.StorageItem; -import storagecraft.tile.settings.ICompareSetting; -import storagecraft.tile.settings.IModeSetting; -import storagecraft.tile.settings.IRedstoneModeSetting; -import storagecraft.util.InventoryUtils; +import refinedstorage.RefinedStorage; +import refinedstorage.block.BlockStorage; +import refinedstorage.block.EnumStorageType; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.network.MessagePriorityUpdate; +import refinedstorage.storage.IStorage; +import refinedstorage.storage.IStorageGui; +import refinedstorage.storage.IStorageProvider; +import refinedstorage.storage.NBTStorage; +import refinedstorage.storage.StorageItem; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.util.InventoryUtils; public class TileStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { @@ -243,7 +243,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora @Override public String getName() { - return "block.storagecraft:storage." + getType().getId() + ".name"; + return "block.refinedstorage:storage." + getType().getId() + ".name"; } @Override @@ -278,7 +278,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora @Override public void onPriorityChanged(int priority) { - StorageCraft.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); } }; } diff --git a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java similarity index 95% rename from src/main/java/storagecraft/tile/TileWirelessTransmitter.java rename to src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 0f80f922e..e910d24ec 100644 --- a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -1,4 +1,4 @@ -package storagecraft.tile; +package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; @@ -6,10 +6,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; -import storagecraft.block.EnumGridType; -import storagecraft.inventory.InventorySimple; -import storagecraft.item.ItemWirelessGrid; -import storagecraft.util.InventoryUtils; +import refinedstorage.block.EnumGridType; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.item.ItemWirelessGrid; +import refinedstorage.util.InventoryUtils; public class TileWirelessTransmitter extends TileMachine implements IInventory { diff --git a/src/main/java/storagecraft/tile/settings/ICompareSetting.java b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java similarity index 82% rename from src/main/java/storagecraft/tile/settings/ICompareSetting.java rename to src/main/java/refinedstorage/tile/settings/ICompareSetting.java index 77f2df1eb..1437d068b 100644 --- a/src/main/java/storagecraft/tile/settings/ICompareSetting.java +++ b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile.settings; +package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/storagecraft/tile/settings/IModeSetting.java b/src/main/java/refinedstorage/tile/settings/IModeSetting.java similarity index 81% rename from src/main/java/storagecraft/tile/settings/IModeSetting.java rename to src/main/java/refinedstorage/tile/settings/IModeSetting.java index 25671bf74..75cc34ca3 100644 --- a/src/main/java/storagecraft/tile/settings/IModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IModeSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile.settings; +package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java similarity index 84% rename from src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java rename to src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java index fec3ef5ba..b774eada5 100644 --- a/src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java @@ -1,4 +1,4 @@ -package storagecraft.tile.settings; +package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/storagecraft/tile/settings/RedstoneMode.java b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java similarity index 95% rename from src/main/java/storagecraft/tile/settings/RedstoneMode.java rename to src/main/java/refinedstorage/tile/settings/RedstoneMode.java index 5fef9681b..3d9bf9556 100644 --- a/src/main/java/storagecraft/tile/settings/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java @@ -1,4 +1,4 @@ -package storagecraft.tile.settings; +package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/storagecraft/tile/solderer/ISoldererRecipe.java b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java similarity index 77% rename from src/main/java/storagecraft/tile/solderer/ISoldererRecipe.java rename to src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java index bab6caabc..8122c8bd8 100644 --- a/src/main/java/storagecraft/tile/solderer/ISoldererRecipe.java +++ b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java @@ -1,4 +1,4 @@ -package storagecraft.tile.solderer; +package refinedstorage.tile.solderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java new file mode 100644 index 000000000..fae2db28e --- /dev/null +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java @@ -0,0 +1,42 @@ +package refinedstorage.tile.solderer; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.block.EnumGridType; +import refinedstorage.item.ItemProcessor; + +public class SoldererRecipeCraftingGrid implements ISoldererRecipe +{ + @Override + public ItemStack getRow(int row) + { + if (row == 0) + { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } + else if (row == 1) + { + return new ItemStack(RefinedStorageBlocks.GRID, 1, 0); + } + else if (row == 2) + { + return new ItemStack(Blocks.crafting_table); + } + + return null; + } + + @Override + public ItemStack getResult() + { + return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); + } + + @Override + public int getDuration() + { + return 500; + } +} diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java similarity index 51% rename from src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java rename to src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java index 648681eae..759119e3c 100644 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java @@ -1,10 +1,10 @@ -package storagecraft.tile.solderer; +package refinedstorage.tile.solderer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.item.ItemProcessor; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; public class SoldererRecipeDrive implements ISoldererRecipe { @@ -13,11 +13,11 @@ public class SoldererRecipeDrive implements ISoldererRecipe { if (row == 0) { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); } else if (row == 1) { - return new ItemStack(StorageCraftBlocks.MACHINE_CASING); + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); } else if (row == 2) { @@ -30,7 +30,7 @@ public class SoldererRecipeDrive implements ISoldererRecipe @Override public ItemStack getResult() { - return new ItemStack(StorageCraftBlocks.DRIVE); + return new ItemStack(RefinedStorageBlocks.DRIVE); } @Override diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipePrintedProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java similarity index 77% rename from src/main/java/storagecraft/tile/solderer/SoldererRecipePrintedProcessor.java rename to src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java index 3f6f7a18f..165dd6af5 100644 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipePrintedProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java @@ -1,9 +1,9 @@ -package storagecraft.tile.solderer; +package refinedstorage.tile.solderer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftItems; -import storagecraft.item.ItemProcessor; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; public class SoldererRecipePrintedProcessor implements ISoldererRecipe { @@ -28,7 +28,7 @@ public class SoldererRecipePrintedProcessor implements ISoldererRecipe case ItemProcessor.TYPE_PRINTED_ADVANCED: return new ItemStack(Items.diamond); case ItemProcessor.TYPE_PRINTED_SILICON: - return new ItemStack(StorageCraftItems.SILICON); + return new ItemStack(RefinedStorageItems.SILICON); } } @@ -38,7 +38,7 @@ public class SoldererRecipePrintedProcessor implements ISoldererRecipe @Override public ItemStack getResult() { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, type); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); } @Override diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java similarity index 56% rename from src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java rename to src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java index d36a42dcf..4ec2e21b5 100644 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java @@ -1,9 +1,9 @@ -package storagecraft.tile.solderer; +package refinedstorage.tile.solderer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftItems; -import storagecraft.item.ItemProcessor; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; public class SoldererRecipeProcessor implements ISoldererRecipe { @@ -22,11 +22,11 @@ public class SoldererRecipeProcessor implements ISoldererRecipe switch (type) { case ItemProcessor.TYPE_BASIC: - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); case ItemProcessor.TYPE_IMPROVED: - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); case ItemProcessor.TYPE_ADVANCED: - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); } } else if (row == 1) @@ -35,7 +35,7 @@ public class SoldererRecipeProcessor implements ISoldererRecipe } else if (row == 2) { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); } return null; @@ -44,7 +44,7 @@ public class SoldererRecipeProcessor implements ISoldererRecipe @Override public ItemStack getResult() { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, type); + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); } @Override diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java new file mode 100644 index 000000000..ab8562fdb --- /dev/null +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java @@ -0,0 +1,51 @@ +package refinedstorage.tile.solderer; + +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.block.EnumStorageType; +import refinedstorage.item.ItemBlockStorage; +import refinedstorage.item.ItemProcessor; + +public class SoldererRecipeStorage implements ISoldererRecipe +{ + private EnumStorageType type; + private int storagePart; + + public SoldererRecipeStorage(EnumStorageType 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.MACHINE_CASING); + } + 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.STORAGE, 1, type.getId())); + } + + @Override + public int getDuration() + { + return 200; + } +} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java new file mode 100644 index 000000000..6ffd916ff --- /dev/null +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java @@ -0,0 +1,47 @@ +package refinedstorage.tile.solderer; + +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; + +public class SoldererRecipeWirelessGrid implements ISoldererRecipe +{ + private int type; + + public SoldererRecipeWirelessGrid(int type) + { + this.type = type; + } + + @Override + public ItemStack getRow(int row) + { + if (row == 0) + { + return new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE); + } + else if (row == 1) + { + return new ItemStack(RefinedStorageBlocks.GRID, 1, type); + } + else if (row == 2) + { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } + + return null; + } + + @Override + public ItemStack getResult() + { + return new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, type); + } + + @Override + public int getDuration() + { + return 1000; + } +} diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java similarity index 88% rename from src/main/java/storagecraft/tile/solderer/SoldererRegistry.java rename to src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java index 90b24dfdc..4855174cd 100644 --- a/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java @@ -1,10 +1,10 @@ -package storagecraft.tile.solderer; +package refinedstorage.tile.solderer; import java.util.ArrayList; import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import storagecraft.util.InventoryUtils; +import refinedstorage.util.InventoryUtils; public class SoldererRegistry { diff --git a/src/main/java/storagecraft/util/InventoryUtils.java b/src/main/java/refinedstorage/util/InventoryUtils.java similarity index 99% rename from src/main/java/storagecraft/util/InventoryUtils.java rename to src/main/java/refinedstorage/util/InventoryUtils.java index fa5245c48..701d635ef 100644 --- a/src/main/java/storagecraft/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/util/InventoryUtils.java @@ -1,4 +1,4 @@ -package storagecraft.util; +package refinedstorage.util; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java deleted file mode 100644 index 1d22ae6c8..000000000 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ /dev/null @@ -1,136 +0,0 @@ -package storagecraft.proxy; - -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.block.EnumControllerType; -import storagecraft.block.EnumGridType; -import storagecraft.block.EnumStorageType; -import storagecraft.item.*; - -public class ClientProxy extends CommonProxy -{ - @Override - public void preInit(FMLPreInitializationEvent e) - { - super.preInit(e); - - // Item Variants - ModelBakery.registerItemVariants(StorageCraftItems.STORAGE_CELL, - new ResourceLocation("storagecraft:1k_storage_cell"), - new ResourceLocation("storagecraft:4k_storage_cell"), - new ResourceLocation("storagecraft:16k_storage_cell"), - new ResourceLocation("storagecraft:64k_storage_cell"), - new ResourceLocation("storagecraft:creative_storage_cell") - ); - - ModelBakery.registerItemVariants(StorageCraftItems.STORAGE_PART, - new ResourceLocation("storagecraft:1k_storage_part"), - new ResourceLocation("storagecraft:4k_storage_part"), - new ResourceLocation("storagecraft:16k_storage_part"), - new ResourceLocation("storagecraft:64k_storage_part") - ); - - ModelBakery.registerItemVariants(StorageCraftItems.PROCESSOR, - new ResourceLocation("storagecraft:basic_printed_processor"), - new ResourceLocation("storagecraft:improved_printed_processor"), - new ResourceLocation("storagecraft:advanced_printed_processor"), - new ResourceLocation("storagecraft:basic_processor"), - new ResourceLocation("storagecraft:improved_processor"), - new ResourceLocation("storagecraft:advanced_processor"), - new ResourceLocation("storagecraft:printed_silicon") - ); - - ModelBakery.registerItemVariants(StorageCraftItems.CORE, - new ResourceLocation("storagecraft:construction_core"), - new ResourceLocation("storagecraft:destruction_core") - ); - - ModelBakery.registerItemVariants(StorageCraftItems.WIRELESS_GRID, - new ResourceLocation("storagecraft:wireless_grid_connected"), - new ResourceLocation("storagecraft:wireless_grid_disconnected") - ); - - // Items - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("storagecraft:1k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("storagecraft:4k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("storagecraft:16k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("storagecraft:64k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("storagecraft:creative_storage_cell", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("storagecraft:1k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("storagecraft:4k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("storagecraft:16k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("storagecraft:64k_storage_part", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("storagecraft:basic_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("storagecraft:improved_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("storagecraft:advanced_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("storagecraft:basic_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("storagecraft:improved_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("storagecraft:advanced_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("storagecraft:printed_silicon", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.SILICON, 0, new ModelResourceLocation("storagecraft:silicon", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("storagecraft:quartz_enriched_iron", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("storagecraft:construction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("storagecraft:destruction_core", "inventory")); - - ModelLoader.setCustomModelResourceLocation(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "inventory")); - - ModelLoader.setCustomMeshDefinition(StorageCraftItems.WIRELESS_GRID, new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if (ItemWirelessGrid.isValid(stack)) - { - return new ModelResourceLocation("storagecraft:wireless_grid_connected", "inventory"); - } - else - { - return new ModelResourceLocation("storagecraft:wireless_grid_disconnected", "inventory"); - } - } - }); - - // Blocks - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.CABLE), 0, new ModelResourceLocation("storagecraft:cable", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("storagecraft:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("storagecraft:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.MACHINE_CASING), 0, new ModelResourceLocation("storagecraft:machine_casing", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.EXPORTER), 0, new ModelResourceLocation("storagecraft:exporter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.IMPORTER), 0, new ModelResourceLocation("storagecraft:importer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("storagecraft:external_storage", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.DRIVE), 0, new ModelResourceLocation("storagecraft:drive", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("storagecraft:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("storagecraft:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("storagecraft:constructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.DESTRUCTOR), 0, new ModelResourceLocation("storagecraft:destructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.SOLDERER), 0, new ModelResourceLocation("storagecraft:solderer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("storagecraft:wireless_transmitter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.DETECTOR), 0, new ModelResourceLocation("storagecraft:detector", "inventory")); - - ModelLoader.setCustomStateMapper(StorageCraftBlocks.STORAGE, (new StateMap.Builder()) - .ignore(StorageCraftBlocks.STORAGE.DIRECTION) - .ignore(StorageCraftBlocks.STORAGE.CONNECTED) - .build() - ); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("storagecraft:storage", "type=1k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("storagecraft:storage", "type=4k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("storagecraft:storage", "type=16k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("storagecraft:storage", "type=64k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("storagecraft:storage", "type=creative")); - } -} diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java deleted file mode 100644 index 6a43e54f8..000000000 --- a/src/main/java/storagecraft/proxy/CommonProxy.java +++ /dev/null @@ -1,357 +0,0 @@ -package storagecraft.proxy; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import storagecraft.StorageCraft; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.block.EnumControllerType; -import storagecraft.block.EnumGridType; -import storagecraft.block.EnumStorageType; -import storagecraft.gui.GuiHandler; -import storagecraft.item.*; -import storagecraft.network.*; -import storagecraft.storage.NBTStorage; -import storagecraft.tile.*; -import storagecraft.tile.solderer.*; - -public class CommonProxy -{ - public void preInit(FMLPreInitializationEvent e) - { - StorageCraft.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); - StorageCraft.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); - StorageCraft.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); - StorageCraft.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); - - NetworkRegistry.INSTANCE.registerGuiHandler(StorageCraft.INSTANCE, new GuiHandler()); - - GameRegistry.registerTileEntity(TileController.class, "controller"); - GameRegistry.registerTileEntity(TileCable.class, "cable"); - GameRegistry.registerTileEntity(TileGrid.class, "grid"); - GameRegistry.registerTileEntity(TileDrive.class, "drive"); - GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); - GameRegistry.registerTileEntity(TileImporter.class, "importer"); - GameRegistry.registerTileEntity(TileExporter.class, "exporter"); - GameRegistry.registerTileEntity(TileDetector.class, "detector"); - GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); - GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); - GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); - GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); - GameRegistry.registerTileEntity(TileStorage.class, "storage"); - - GameRegistry.registerBlock(StorageCraftBlocks.CONTROLLER, ItemBlockController.class, "controller"); - GameRegistry.registerBlock(StorageCraftBlocks.CABLE, "cable"); - GameRegistry.registerBlock(StorageCraftBlocks.GRID, ItemBlockGrid.class, "grid"); - GameRegistry.registerBlock(StorageCraftBlocks.DRIVE, "drive"); - GameRegistry.registerBlock(StorageCraftBlocks.EXTERNAL_STORAGE, "external_storage"); - GameRegistry.registerBlock(StorageCraftBlocks.IMPORTER, "importer"); - GameRegistry.registerBlock(StorageCraftBlocks.EXPORTER, "exporter"); - GameRegistry.registerBlock(StorageCraftBlocks.DETECTOR, "detector"); - GameRegistry.registerBlock(StorageCraftBlocks.MACHINE_CASING, "machine_casing"); - GameRegistry.registerBlock(StorageCraftBlocks.SOLDERER, "solderer"); - GameRegistry.registerBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); - GameRegistry.registerBlock(StorageCraftBlocks.DESTRUCTOR, "destructor"); - GameRegistry.registerBlock(StorageCraftBlocks.CONSTRUCTOR, "constructor"); - GameRegistry.registerBlock(StorageCraftBlocks.STORAGE, ItemBlockStorage.class, "storage"); - - GameRegistry.registerItem(StorageCraftItems.STORAGE_CELL, "storage_cell"); - GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID, "wireless_grid"); - GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); - GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); - GameRegistry.registerItem(StorageCraftItems.CORE, "core"); - GameRegistry.registerItem(StorageCraftItems.SILICON, "silicon"); - GameRegistry.registerItem(StorageCraftItems.PROCESSOR, "processor"); - GameRegistry.registerItem(StorageCraftItems.STORAGE_PART, "storage_part"); - - // Processors - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); - - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); - - // Silicon - GameRegistry.addSmelting(Items.quartz, new ItemStack(StorageCraftItems.SILICON), 0.5f); - - // Quartz Enriched Iron - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON, 4), - "II", - "IQ", - 'I', new ItemStack(Items.iron_ingot), - 'Q', new ItemStack(Items.quartz) - ); - - // Machine Casing - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.MACHINE_CASING), - "EEE", - "E E", - "EEE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - // Construction Core - GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.glowstone_dust) - ); - - // Destruction Core - GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.quartz) - ); - - // Controller - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), - "EDE", - "SRS", - "ESE", - 'D', new ItemStack(Items.diamond), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'S', new ItemStack(StorageCraftItems.SILICON) - ); - - // Solderer - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.SOLDERER), - "ESE", - "E E", - "ESE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'S', new ItemStack(Blocks.sticky_piston) - ); - - // Drive - SoldererRegistry.addRecipe(new SoldererRecipeDrive()); - - // Cable - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.CABLE, 6), - "EEE", - "GRG", - "EEE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone) - ); - - // Grid - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.GRID, 1, EnumGridType.NORMAL.getId()), - "ECE", - "PMP", - "EDE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) - ); - - // Crafting Grid - SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); - - // Wireless Transmitter - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.WIRELESS_TRANSMITTER), - "EPE", - "EME", - "EAE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'A', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'P', new ItemStack(Items.ender_pearl), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) - ); - - // Wireless Grid Plate - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.WIRELESS_GRID_PLATE), - " P ", - "ERE", - "EEE", - 'P', new ItemStack(Items.ender_pearl), - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - // Wireless Grid - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); - - // External Storage - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.EXTERNAL_STORAGE), - "CED", - "HMH", - "EPE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'H', new ItemStack(Blocks.chest), - 'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); - - // Importer - GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.IMPORTER), - new ItemStack(StorageCraftBlocks.MACHINE_CASING), - new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); - - // Exporter - GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.EXPORTER), - new ItemStack(StorageCraftBlocks.MACHINE_CASING), - new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); - - // Destructor - GameRegistry.addShapedRecipe(new ItemStack(StorageCraftBlocks.DESTRUCTOR), - "EDE", - "RMR", - "EIE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING), - 'I', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); - - // Constructor - GameRegistry.addShapedRecipe(new ItemStack(StorageCraftBlocks.CONSTRUCTOR), - "ECE", - "RMR", - "EIE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING), - 'I', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); - - // Detector - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.DETECTOR), - "ECE", - "RMR", - "EPE", - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'C', new ItemStack(Items.comparator), - 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); - - // Storage Cell Parts - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(StorageCraftItems.SILICON), - 'S', new ItemStack(Blocks.glass) - ); - - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'S', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) - ); - - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'S', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) - ); - - GameRegistry.addRecipe(new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'S', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) - ); - - // Storage Cells - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) - ); - - // Storage Blocks - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); - } - - public void init(FMLInitializationEvent e) - { - } - - public void postInit(FMLPostInitializationEvent e) - { - } -} diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java deleted file mode 100644 index 88916e4d3..000000000 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java +++ /dev/null @@ -1,42 +0,0 @@ -package storagecraft.tile.solderer; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.block.EnumGridType; -import storagecraft.item.ItemProcessor; - -public class SoldererRecipeCraftingGrid implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - else if (row == 1) - { - return new ItemStack(StorageCraftBlocks.GRID, 1, 0); - } - else if (row == 2) - { - return new ItemStack(Blocks.crafting_table); - } - - return null; - } - - @Override - public ItemStack getResult() - { - return new ItemStack(StorageCraftBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); - } - - @Override - public int getDuration() - { - return 500; - } -} diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java deleted file mode 100644 index 64779e389..000000000 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java +++ /dev/null @@ -1,51 +0,0 @@ -package storagecraft.tile.solderer; - -import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.block.EnumStorageType; -import storagecraft.item.ItemBlockStorage; -import storagecraft.item.ItemProcessor; - -public class SoldererRecipeStorage implements ISoldererRecipe -{ - private EnumStorageType type; - private int storagePart; - - public SoldererRecipeStorage(EnumStorageType type, int storagePart) - { - this.type = type; - this.storagePart = storagePart; - } - - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(StorageCraftItems.STORAGE_PART, 1, storagePart); - } - else if (row == 1) - { - return new ItemStack(StorageCraftBlocks.MACHINE_CASING); - } - else if (row == 2) - { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - - return null; - } - - @Override - public ItemStack getResult() - { - return ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, type.getId())); - } - - @Override - public int getDuration() - { - return 200; - } -} diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java deleted file mode 100644 index 85028601a..000000000 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java +++ /dev/null @@ -1,47 +0,0 @@ -package storagecraft.tile.solderer; - -import net.minecraft.item.ItemStack; -import storagecraft.StorageCraftBlocks; -import storagecraft.StorageCraftItems; -import storagecraft.item.ItemProcessor; - -public class SoldererRecipeWirelessGrid implements ISoldererRecipe -{ - private int type; - - public SoldererRecipeWirelessGrid(int type) - { - this.type = type; - } - - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(StorageCraftItems.WIRELESS_GRID_PLATE); - } - else if (row == 1) - { - return new ItemStack(StorageCraftBlocks.GRID, 1, type); - } - else if (row == 2) - { - return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - - return null; - } - - @Override - public ItemStack getResult() - { - return new ItemStack(StorageCraftItems.WIRELESS_GRID, 1, type); - } - - @Override - public int getDuration() - { - return 1000; - } -} diff --git a/src/main/resources/assets/storagecraft/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json similarity index 55% rename from src/main/resources/assets/storagecraft/blockstates/cable.json rename to src/main/resources/assets/refinedstorage/blockstates/cable.json index 30f99a268..da0d91d09 100644 --- a/src/main/resources/assets/storagecraft/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -2,55 +2,55 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "storagecraft:blocks/cable", - "particle": "storagecraft:blocks/cable" + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" }, - "model": "storagecraft:cable_core", + "model": "refinedstorage:cable_core", "uvlock": true }, "variants": { "inventory": [{ - "model": "storagecraft:cable", + "model": "refinedstorage:cable", "transform": "forge:default-block" }], "north": { "true": { - "submodel": "storagecraft:cable_north" + "submodel": "refinedstorage:cable_north" }, "false": { } }, "east": { "true": { - "submodel": "storagecraft:cable_east" + "submodel": "refinedstorage:cable_east" }, "false": { } }, "south": { "true": { - "submodel": "storagecraft:cable_south" + "submodel": "refinedstorage:cable_south" }, "false": { } }, "west": { "true": { - "submodel": "storagecraft:cable_west" + "submodel": "refinedstorage:cable_west" }, "false": { } }, "up": { "true": { - "submodel": "storagecraft:cable_up" + "submodel": "refinedstorage:cable_up" }, "false": { } }, "down": { "true": { - "submodel": "storagecraft:cable_down" + "submodel": "refinedstorage:cable_down" }, "false": { } diff --git a/src/main/resources/assets/storagecraft/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json similarity index 66% rename from src/main/resources/assets/storagecraft/blockstates/constructor.json rename to src/main/resources/assets/refinedstorage/blockstates/constructor.json index 50386af4e..86a3dc400 100644 --- a/src/main/resources/assets/storagecraft/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -3,8 +3,8 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" } }, "variants": { @@ -13,19 +13,19 @@ "y": 0, "transform": "forge:default-block", "textures": { - "front": "storagecraft:blocks/constructor_disconnected" + "front": "refinedstorage:blocks/constructor_disconnected" } } ], "connected": { "true": { "textures": { - "front": "storagecraft:blocks/constructor_connected" + "front": "refinedstorage:blocks/constructor_connected" } }, "false": { "textures": { - "front": "storagecraft:blocks/constructor_disconnected" + "front": "refinedstorage:blocks/constructor_disconnected" } } }, diff --git a/src/main/resources/assets/storagecraft/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json similarity index 58% rename from src/main/resources/assets/storagecraft/blockstates/controller.json rename to src/main/resources/assets/refinedstorage/blockstates/controller.json index 059bd6a06..f148cfbbf 100644 --- a/src/main/resources/assets/storagecraft/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/controller_0" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/controller_0" } }, "variants": { @@ -18,47 +18,47 @@ "energy": { "0": { "textures": { - "front": "storagecraft:blocks/controller_0" + "front": "refinedstorage:blocks/controller_0" } }, "1": { "textures": { - "front": "storagecraft:blocks/controller_1" + "front": "refinedstorage:blocks/controller_1" } }, "2": { "textures": { - "front": "storagecraft:blocks/controller_2" + "front": "refinedstorage:blocks/controller_2" } }, "3": { "textures": { - "front": "storagecraft:blocks/controller_3" + "front": "refinedstorage:blocks/controller_3" } }, "4": { "textures": { - "front": "storagecraft:blocks/controller_4" + "front": "refinedstorage:blocks/controller_4" } }, "5": { "textures": { - "front": "storagecraft:blocks/controller_5" + "front": "refinedstorage:blocks/controller_5" } }, "6": { "textures": { - "front": "storagecraft:blocks/controller_6" + "front": "refinedstorage:blocks/controller_6" } }, "7": { "textures": { - "front": "storagecraft:blocks/controller_7" + "front": "refinedstorage:blocks/controller_7" } }, "8": { "textures": { - "front": "storagecraft:blocks/controller_8" + "front": "refinedstorage:blocks/controller_8" } } }, diff --git a/src/main/resources/assets/storagecraft/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json similarity index 66% rename from src/main/resources/assets/storagecraft/blockstates/destructor.json rename to src/main/resources/assets/refinedstorage/blockstates/destructor.json index ab35e9b36..e947cc052 100644 --- a/src/main/resources/assets/storagecraft/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -3,8 +3,8 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" } }, "variants": { @@ -13,19 +13,19 @@ "y": 0, "transform": "forge:default-block", "textures": { - "front": "storagecraft:blocks/destructor_disconnected" + "front": "refinedstorage:blocks/destructor_disconnected" } } ], "connected": { "true": { "textures": { - "front": "storagecraft:blocks/destructor_connected" + "front": "refinedstorage:blocks/destructor_connected" } }, "false": { "textures": { - "front": "storagecraft:blocks/destructor_disconnected" + "front": "refinedstorage:blocks/destructor_disconnected" } } }, diff --git a/src/main/resources/assets/storagecraft/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json similarity index 73% rename from src/main/resources/assets/storagecraft/blockstates/detector.json rename to src/main/resources/assets/refinedstorage/blockstates/detector.json index e48e9bd72..d1c62d543 100644 --- a/src/main/resources/assets/storagecraft/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/detector_unpowered" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/detector_unpowered" } }, "variants": { @@ -24,7 +24,7 @@ "powered": { "true": { "textures": { - "front": "storagecraft:blocks/detector_powered" + "front": "refinedstorage:blocks/detector_powered" } }, "false": { diff --git a/src/main/resources/assets/storagecraft/blockstates/drive.json b/src/main/resources/assets/refinedstorage/blockstates/drive.json similarity index 78% rename from src/main/resources/assets/storagecraft/blockstates/drive.json rename to src/main/resources/assets/refinedstorage/blockstates/drive.json index 259b000b7..7498bdd96 100644 --- a/src/main/resources/assets/storagecraft/blockstates/drive.json +++ b/src/main/resources/assets/refinedstorage/blockstates/drive.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/drive" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/drive" } }, "variants": { diff --git a/src/main/resources/assets/storagecraft/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json similarity index 78% rename from src/main/resources/assets/storagecraft/blockstates/exporter.json rename to src/main/resources/assets/refinedstorage/blockstates/exporter.json index 702865b30..3e97ab4d9 100644 --- a/src/main/resources/assets/storagecraft/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/exporter" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/exporter" } }, "variants": { diff --git a/src/main/resources/assets/storagecraft/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json similarity index 77% rename from src/main/resources/assets/storagecraft/blockstates/external_storage.json rename to src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 5a4cec032..6b891d4ee 100644 --- a/src/main/resources/assets/storagecraft/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/external_storage" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/external_storage" } }, "variants": { diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json similarity index 70% rename from src/main/resources/assets/storagecraft/blockstates/grid.json rename to src/main/resources/assets/refinedstorage/blockstates/grid.json index 096938036..578d68dd0 100644 --- a/src/main/resources/assets/storagecraft/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -3,15 +3,15 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" } }, "variants": { "inventory": [ { "textures": { - "front": "storagecraft:blocks/grid_disconnected" + "front": "refinedstorage:blocks/grid_disconnected" }, "transform": "forge:default-block", "y": 0 @@ -26,12 +26,12 @@ "connected": { "true": { "textures": { - "front": "storagecraft:blocks/grid_connected" + "front": "refinedstorage:blocks/grid_connected" } }, "false": { "textures": { - "front": "storagecraft:blocks/grid_disconnected" + "front": "refinedstorage:blocks/grid_disconnected" } } }, diff --git a/src/main/resources/assets/storagecraft/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json similarity index 78% rename from src/main/resources/assets/storagecraft/blockstates/importer.json rename to src/main/resources/assets/refinedstorage/blockstates/importer.json index 1399c43bc..88a844591 100644 --- a/src/main/resources/assets/storagecraft/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side", - "front": "storagecraft:blocks/importer" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/importer" } }, "variants": { diff --git a/src/main/resources/assets/storagecraft/blockstates/machine_casing.json b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json similarity index 88% rename from src/main/resources/assets/storagecraft/blockstates/machine_casing.json rename to src/main/resources/assets/refinedstorage/blockstates/machine_casing.json index 544299c84..243b9a488 100644 --- a/src/main/resources/assets/storagecraft/blockstates/machine_casing.json +++ b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "storagecraft:blocks/side" + "all": "refinedstorage:blocks/side" } }, "variants": { diff --git a/src/main/resources/assets/storagecraft/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json similarity index 67% rename from src/main/resources/assets/storagecraft/blockstates/solderer.json rename to src/main/resources/assets/refinedstorage/blockstates/solderer.json index 6eb92f6e2..d2f88bdf8 100644 --- a/src/main/resources/assets/storagecraft/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -3,8 +3,8 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/side", - "top": "storagecraft:blocks/side" + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" } }, "variants": { @@ -12,7 +12,7 @@ { "y": 0, "textures": { - "front": "storagecraft:blocks/solderer_disconnected" + "front": "refinedstorage:blocks/solderer_disconnected" }, "transform": "forge:default-block" } @@ -20,12 +20,12 @@ "connected": { "true": { "textures": { - "front": "storagecraft:blocks/solderer_connected" + "front": "refinedstorage:blocks/solderer_connected" } }, "false": { "textures": { - "front": "storagecraft:blocks/solderer_disconnected" + "front": "refinedstorage:blocks/solderer_disconnected" } } }, diff --git a/src/main/resources/assets/storagecraft/blockstates/storage.json b/src/main/resources/assets/refinedstorage/blockstates/storage.json similarity index 56% rename from src/main/resources/assets/storagecraft/blockstates/storage.json rename to src/main/resources/assets/refinedstorage/blockstates/storage.json index 8ef91224a..3104f7dea 100644 --- a/src/main/resources/assets/storagecraft/blockstates/storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage.json @@ -8,27 +8,27 @@ "type": { "1k": { "textures": { - "all": "storagecraft:blocks/1k_storage_block" + "all": "refinedstorage:blocks/1k_storage_block" } }, "4k": { "textures": { - "all": "storagecraft:blocks/4k_storage_block" + "all": "refinedstorage:blocks/4k_storage_block" } }, "16k": { "textures": { - "all": "storagecraft:blocks/16k_storage_block" + "all": "refinedstorage:blocks/16k_storage_block" } }, "64k": { "textures": { - "all": "storagecraft:blocks/64k_storage_block" + "all": "refinedstorage:blocks/64k_storage_block" } }, "creative": { "textures": { - "all": "storagecraft:blocks/creative_storage_block" + "all": "refinedstorage:blocks/creative_storage_block" } } } diff --git a/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json similarity index 57% rename from src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json rename to src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json index 45194e033..83c6efba5 100644 --- a/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -3,9 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "storagecraft:blocks/wireless_transmitter_side", - "top": "storagecraft:blocks/wireless_transmitter_side", - "front": "storagecraft:blocks/wireless_transmitter" + "side": "refinedstorage:blocks/wireless_transmitter_side", + "top": "refinedstorage:blocks/wireless_transmitter_side", + "front": "refinedstorage:blocks/wireless_transmitter" } }, "variants": { @@ -44,9 +44,9 @@ "working": { "true": { "textures": { - "side": "storagecraft:blocks/wireless_transmitter_side_working", - "top": "storagecraft:blocks/wireless_transmitter_side_working", - "front": "storagecraft:blocks/wireless_transmitter_working" + "side": "refinedstorage:blocks/wireless_transmitter_side_working", + "top": "refinedstorage:blocks/wireless_transmitter_side_working", + "front": "refinedstorage:blocks/wireless_transmitter_working" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang new file mode 100644 index 000000000..e416d62ab --- /dev/null +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -0,0 +1,108 @@ +itemGroup.refinedstorage=Refined Storage + +gui.refinedstorage:controller.0=Controller +gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:grid=Grid +gui.refinedstorage:drive=Drive +gui.refinedstorage:external_storage=External Storage +gui.refinedstorage:importer=Importer +gui.refinedstorage:exporter=Exporter +gui.refinedstorage:detector=Detector +gui.refinedstorage:solderer=Solderer +gui.refinedstorage:wireless_transmitter=Wireless Transmitter +gui.refinedstorage:destructor=Destructor +gui.refinedstorage:constructor=Constructor + +misc.refinedstorage:energy_stored=%d / %d RF +misc.refinedstorage:energy_usage=Usage: %d RF/t + +misc.refinedstorage:storage=Storage +misc.refinedstorage:storage.stored=Stored: %d +misc.refinedstorage:storage.stored_capacity=Stored: %d / %d +misc.refinedstorage:storage.capacity=Capacity: %d +misc.refinedstorage:storage.full=%d%% full + +misc.refinedstorage:wireless_grid.tooltip=Bound to %d, %d, %d. +misc.refinedstorage:wireless_grid.not_working=The Wireless Transmitter is disabled or out of fuel. +misc.refinedstorage:wireless_grid.not_found=The Wireless Transmitter is not found. +misc.refinedstorage:wireless_grid.not_set.0=This Wireless Grid is not bound to a Wireless Transmitter yet. +misc.refinedstorage:wireless_grid.not_set.1=This Wireless Crafting Grid is not bound to a Wireless Transmitter yet. +misc.refinedstorage:wireless_grid.out_of_range=The Wireless Transmitter is out of range. +misc.refinedstorage:wireless_grid.no_grid.0=There is no Grid found in the network. You need to place a Grid before you can use the Wireless Grid! +misc.refinedstorage:wireless_grid.no_grid.1=There is no Crafting Grid found in the network. You need to place a Crafting Grid before you can use the Wireless Crafting Grid! + +misc.refinedstorage:yes=Yes +misc.refinedstorage:no=No +misc.refinedstorage:clear=Clear +misc.refinedstorage:priority=Priority + +sidebutton.refinedstorage:compare.1=Compare Damage +sidebutton.refinedstorage:compare.2=Compare NBT + +sidebutton.refinedstorage:redstone_mode=Redstone Mode +sidebutton.refinedstorage:redstone_mode.0=Ignore redstone signal +sidebutton.refinedstorage:redstone_mode.1=Only work with redstone signal +sidebutton.refinedstorage:redstone_mode.2=Only work without redstone signal + +sidebutton.refinedstorage:sorting.direction=Sorting Direction +sidebutton.refinedstorage:sorting.direction.0=Ascending +sidebutton.refinedstorage:sorting.direction.1=Descending + +sidebutton.refinedstorage:sorting.type=Sorting Type +sidebutton.refinedstorage:sorting.type.0=Quantity +sidebutton.refinedstorage:sorting.type.1=Name + +sidebutton.refinedstorage:mode=Mode +sidebutton.refinedstorage:mode.whitelist=Whitelist +sidebutton.refinedstorage:mode.blacklist=Blacklist + +sidebutton.refinedstorage:detector.mode=Mode +sidebutton.refinedstorage:detector.mode.0=Emit signal when under the amount +sidebutton.refinedstorage:detector.mode.1=Emit signal when on the amount +sidebutton.refinedstorage:detector.mode.2=Emit signal when above the amount + +block.refinedstorage:controller.0.name=Controller +block.refinedstorage:controller.1.name=Creative Controller +block.refinedstorage:cable.name=Cable +block.refinedstorage:grid.0.name=Grid +block.refinedstorage:grid.1.name=Crafting Grid +block.refinedstorage:drive.name=Drive +block.refinedstorage:external_storage.name=External Storage +block.refinedstorage:importer.name=Importer +block.refinedstorage:exporter.name=Exporter +block.refinedstorage:detector.name=Detector +block.refinedstorage:machine_casing.name=Machine Casing +block.refinedstorage:solderer.name=Solderer +block.refinedstorage:wireless_transmitter.name=Wireless Transmitter +block.refinedstorage:destructor.name=Destructor +block.refinedstorage:constructor.name=Constructor +block.refinedstorage:storage.0.name=1k Storage Block +block.refinedstorage:storage.1.name=4k Storage Block +block.refinedstorage:storage.2.name=16k Storage Block +block.refinedstorage:storage.3.name=64k Storage Block +block.refinedstorage:storage.4.name=Creative Storage Block +block.refinedstorage:crafter.name=Crafter + +item.refinedstorage:storage_cell.0.name=1k Storage Cell +item.refinedstorage:storage_cell.1.name=4k Storage Cell +item.refinedstorage:storage_cell.2.name=16k Storage Cell +item.refinedstorage:storage_cell.3.name=64k Storage Cell +item.refinedstorage:storage_cell.4.name=Creative Storage Cell +item.refinedstorage:wireless_grid.0.name=Wireless Grid +item.refinedstorage:wireless_grid.1.name=Wireless Crafting Grid +item.refinedstorage:wireless_grid_plate.name=Wireless Grid Plate +item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron +item.refinedstorage:core.0.name=Construction Core +item.refinedstorage:core.1.name=Destruction Core +item.refinedstorage:silicon.name=Silicon +item.refinedstorage:processor.0.name=Printed Basic Processor +item.refinedstorage:processor.1.name=Printed Improved Processor +item.refinedstorage:processor.2.name=Printed Advanced Processor +item.refinedstorage:processor.3.name=Basic Processor +item.refinedstorage:processor.4.name=Improved Processor +item.refinedstorage:processor.5.name=Advanced Processor +item.refinedstorage:processor.6.name=Printed Silicon +item.refinedstorage:storage_part.0.name=1k Storage Part +item.refinedstorage:storage_part.1.name=4k Storage Part +item.refinedstorage:storage_part.2.name=16k Storage Part +item.refinedstorage:storage_part.3.name=64k Storage Part \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang new file mode 100644 index 000000000..e0c643ae0 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -0,0 +1,108 @@ +itemGroup.refinedstorage=Refined Storage + +gui.refinedstorage:controller.0=Controller +gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:grid=Rooster +gui.refinedstorage:drive=Schijf +gui.refinedstorage:external_storage=Externe Opslag +gui.refinedstorage:importer=Importeur +gui.refinedstorage:exporter=Exporteur +gui.refinedstorage:detector=Detector +gui.refinedstorage:solderer=Soldeerder +gui.refinedstorage:wireless_transmitter=Draadloze Zender +gui.refinedstorage:destructor=Destructor +gui.refinedstorage:constructor=Constructor +gui.refinedstorage:crafter=Crafter + +misc.refinedstorage:energy_stored=%d / %d RF +misc.refinedstorage:energy_usage=Vebruik: %d RF/t + +misc.refinedstorage:storage=Opslag +misc.refinedstorage:storage.stored=Opgeslagen: %d +misc.refinedstorage:storage.stored_capacity=Opgeslagen: %d / %d +misc.refinedstorage:storage.capacity=Capaciteit: %d +misc.refinedstorage:storage.full=%d%% vol + +misc.refinedstorage:wireless_grid.tooltip=Gebonden aan %d, %d, %d. +misc.refinedstorage:wireless_grid.not_working=De Draadloze Zender is uit of zonder brandstof gevallen. +misc.refinedstorage:wireless_grid.not_found=De Draadloze Zender werd niet gevonden. +misc.refinedstorage:wireless_grid.not_set.0=Dit Draadloos Rooster is nog niet gebonden aan een Draadloze Zender. +misc.refinedstorage:wireless_grid.not_set.1=Dit Draadloos Crafting Rooster is nog niet gebonden aan een Draadloze Zender. +misc.refinedstorage:wireless_grid.out_of_range=De Draadloze Zender is buiten bereik. +misc.refinedstorage:wireless_grid.no_grid.0=Er is geen Rooster gevonden in het netwerk. Je moet eerst een Rooster plaatsen voor je het Draadloze Rooster kunt gebruiken. +misc.refinedstorage:wireless_grid.no_grid.1=Er is geen Crafting Rooster gevonden in het netwerk. Je moet eerst een Crafting Rooster plaatsen voor je het Draadloze Crafting Rooster kunt gebruiken. + +misc.refinedstorage:yes=Ja +misc.refinedstorage:no=Nee +misc.refinedstorage:clear=Legen +misc.refinedstorage:priority=Prioriteit + +sidebutton.refinedstorage:compare.1=Vergelijken op damage +sidebutton.refinedstorage:compare.2=Vergelijken op NBT + +sidebutton.refinedstorage:redstone_mode=Redstone Mode +sidebutton.refinedstorage:redstone_mode.0=Redstone negeren +sidebutton.refinedstorage:redstone_mode.1=Alleen werken met redstone signaal +sidebutton.refinedstorage:redstone_mode.2=Alleen werken zonder redstone signaal + +sidebutton.refinedstorage:sorting.direction=Sorteer Richting +sidebutton.refinedstorage:sorting.direction.0=Oplopend +sidebutton.refinedstorage:sorting.direction.1=Aflopend + +sidebutton.refinedstorage:sorting.type=Sorteer Type +sidebutton.refinedstorage:sorting.type.0=Hoeveelheid +sidebutton.refinedstorage:sorting.type.1=Naam + +sidebutton.refinedstorage:mode=Mode +sidebutton.refinedstorage:mode.whitelist=Whitelist +sidebutton.refinedstorage:mode.blacklist=Blacklist + +sidebutton.refinedstorage:detector.mode=Mode +sidebutton.refinedstorage:detector.mode.0=Redstone signaal aan wanneer onder het aantal +sidebutton.refinedstorage:detector.mode.1=Redstone signaal aan wanneer op het aantal +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:cable.name=Kabel +block.refinedstorage:grid.0.name=Rooster +block.refinedstorage:grid.1.name=Crafting Rooster +block.refinedstorage:drive.name=Schijf +block.refinedstorage:external_storage.name=Externe Opslag +block.refinedstorage:importer.name=Importeur +block.refinedstorage:exporter.name=Exporteur +block.refinedstorage:detector.name=Detector +block.refinedstorage:machine_casing.name=Machine-omhulsel +block.refinedstorage:solderer.name=Soldeerder +block.refinedstorage:wireless_transmitter.name=Draadloze Zender +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 + +item.refinedstorage:storage_cell.0.name=1k Opslagcel +item.refinedstorage:storage_cell.1.name=4k Opslagcel +item.refinedstorage:storage_cell.2.name=16k Opslagcel +item.refinedstorage:storage_cell.3.name=64k Opslagcel +item.refinedstorage:storage_cell.4.name=Creative Opslagcel +item.refinedstorage:wireless_grid.0.name=Draadloze Rooster +item.refinedstorage:wireless_grid.1.name=Draadloze Crafting Rooster +item.refinedstorage:wireless_grid_plate.name=Draadloze Rooster Bord +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: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:storage_part.0.name=1k Opslagdeel +item.refinedstorage:storage_part.1.name=4k Opslagdeel +item.refinedstorage:storage_part.2.name=16k Opslagdeel +item.refinedstorage:storage_part.3.name=64k Opslagdeel \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable.json rename to src/main/resources/assets/refinedstorage/models/block/cable.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_core.json rename to src/main/resources/assets/refinedstorage/models/block/cable_core.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_down.json rename to src/main/resources/assets/refinedstorage/models/block/cable_down.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_east.json rename to src/main/resources/assets/refinedstorage/models/block/cable_east.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_north.json rename to src/main/resources/assets/refinedstorage/models/block/cable_north.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_south.json rename to src/main/resources/assets/refinedstorage/models/block/cable_south.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_up.json rename to src/main/resources/assets/refinedstorage/models/block/cable_up.json diff --git a/src/main/resources/assets/storagecraft/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json similarity index 100% rename from src/main/resources/assets/storagecraft/models/block/cable_west.json rename to src/main/resources/assets/refinedstorage/models/block/cable_west.json diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json new file mode 100644 index 000000000..e6ec70183 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_cell" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json new file mode 100644 index 000000000..6e5519a16 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_part" + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/1k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/1k_storage_cell.json rename to src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json index 3af69ab27..92eb3c266 100644 --- a/src/main/resources/assets/storagecraft/models/item/1k_storage_cell.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/1k_storage_cell" + "layer0": "refinedstorage:items/1k_storage_cell" } } diff --git a/src/main/resources/assets/storagecraft/models/item/1k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/1k_storage_part.json rename to src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json index 007db58d7..09e84303c 100644 --- a/src/main/resources/assets/storagecraft/models/item/1k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/1k_storage_part" + "layer0": "refinedstorage:items/1k_storage_part" } } diff --git a/src/main/resources/assets/storagecraft/models/item/4k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/4k_storage_cell.json rename to src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json index 0e7d0786a..8824a609d 100644 --- a/src/main/resources/assets/storagecraft/models/item/4k_storage_cell.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/4k_storage_cell" + "layer0": "refinedstorage:items/4k_storage_cell" } } diff --git a/src/main/resources/assets/storagecraft/models/item/4k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/4k_storage_part.json rename to src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json index 7aa0a1235..9e293d54f 100644 --- a/src/main/resources/assets/storagecraft/models/item/4k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/4k_storage_part" + "layer0": "refinedstorage:items/4k_storage_part" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json new file mode 100644 index 000000000..45364a6d2 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_cell" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json new file mode 100644 index 000000000..6bca83069 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_part" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json new file mode 100644 index 000000000..c2d3ba27e --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_printed_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json new file mode 100644 index 000000000..93ce71e7d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json new file mode 100644 index 000000000..30cd2ee78 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/basic_printed_processor" + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/basic_processor.json rename to src/main/resources/assets/refinedstorage/models/item/basic_processor.json index d98c8fdfb..76ca670d3 100644 --- a/src/main/resources/assets/storagecraft/models/item/basic_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/basic_processor" + "layer0": "refinedstorage:items/basic_processor" } } diff --git a/src/main/resources/assets/storagecraft/models/item/blank_pattern.json b/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json similarity index 51% rename from src/main/resources/assets/storagecraft/models/item/blank_pattern.json rename to src/main/resources/assets/refinedstorage/models/item/blank_pattern.json index 3e661b335..fdd3537e0 100644 --- a/src/main/resources/assets/storagecraft/models/item/blank_pattern.json +++ b/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/blank_pattern" + "layer0": "refinedstorage:items/blank_pattern" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/src/main/resources/assets/refinedstorage/models/item/construction_core.json new file mode 100644 index 000000000..8d7d69455 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/construction_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/construction_core" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json new file mode 100644 index 000000000..3088d2636 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/creative_storage_cell" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json new file mode 100644 index 000000000..c58e13661 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/destruction_core" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json new file mode 100644 index 000000000..6422d750d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_printed_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json new file mode 100644 index 000000000..a76b43436 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_processor" + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/printed_silicon.json b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json similarity index 50% rename from src/main/resources/assets/storagecraft/models/item/printed_silicon.json rename to src/main/resources/assets/refinedstorage/models/item/printed_silicon.json index 67c465b46..69a3b0a89 100644 --- a/src/main/resources/assets/storagecraft/models/item/printed_silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/printed_silicon" + "layer0": "refinedstorage:items/printed_silicon" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json new file mode 100644 index 000000000..688321cf7 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/quartz_enriched_iron" + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/silicon.json b/src/main/resources/assets/refinedstorage/models/item/silicon.json similarity index 54% rename from src/main/resources/assets/storagecraft/models/item/silicon.json rename to src/main/resources/assets/refinedstorage/models/item/silicon.json index 7ba05c6dc..091538c0d 100644 --- a/src/main/resources/assets/storagecraft/models/item/silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/silicon.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "storagecraft:items/silicon" + "layer0": "refinedstorage:items/silicon" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json new file mode 100644 index 000000000..73cacbc69 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_connected" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json new file mode 100644 index 000000000..7cc6fc397 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_disconnected" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json new file mode 100644 index 000000000..08fb6203a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_plate" + } +} diff --git a/src/main/resources/assets/storagecraft/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/16k_storage_block.png rename to src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/1k_storage_block.png rename to src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/4k_storage_block.png rename to src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/64k_storage_block.png rename to src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/cable.png rename to src/main/resources/assets/refinedstorage/textures/blocks/cable.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/constructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/constructor_connected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/constructor_disconnected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_0.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_1.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_2.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_3.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_4.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_5.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_6.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_7.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller_8.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/controller_8.png rename to src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/creative_storage_block.png rename to src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/destructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/destructor_connected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/destructor_disconnected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/detector_powered.png rename to src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/detector_unpowered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/detector_unpowered.png rename to src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/drive.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/drive.png rename to src/main/resources/assets/refinedstorage/textures/blocks/drive.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/exporter.png b/src/main/resources/assets/refinedstorage/textures/blocks/exporter.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/exporter.png rename to src/main/resources/assets/refinedstorage/textures/blocks/exporter.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/external_storage.png rename to src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/grid_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/grid_connected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/grid_disconnected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/importer.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/importer.png rename to src/main/resources/assets/refinedstorage/textures/blocks/importer.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/side.png b/src/main/resources/assets/refinedstorage/textures/blocks/side.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/side.png rename to src/main/resources/assets/refinedstorage/textures/blocks/side.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/solderer_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/solderer_connected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/solderer_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/solderer_disconnected.png rename to src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter.png rename to src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side.png rename to src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_side_working.png rename to src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png diff --git a/src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/wireless_transmitter_working.png rename to src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/constructor.png b/src/main/resources/assets/refinedstorage/textures/gui/constructor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/constructor.png rename to src/main/resources/assets/refinedstorage/textures/gui/constructor.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/controller.png b/src/main/resources/assets/refinedstorage/textures/gui/controller.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/controller.png rename to src/main/resources/assets/refinedstorage/textures/gui/controller.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/crafting_grid.png rename to src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/destructor.png b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/destructor.png rename to src/main/resources/assets/refinedstorage/textures/gui/destructor.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/detector.png b/src/main/resources/assets/refinedstorage/textures/gui/detector.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/detector.png rename to src/main/resources/assets/refinedstorage/textures/gui/detector.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/drive.png b/src/main/resources/assets/refinedstorage/textures/gui/drive.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/drive.png rename to src/main/resources/assets/refinedstorage/textures/gui/drive.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/exporter.png b/src/main/resources/assets/refinedstorage/textures/gui/exporter.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/exporter.png rename to src/main/resources/assets/refinedstorage/textures/gui/exporter.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/grid.png rename to src/main/resources/assets/refinedstorage/textures/gui/grid.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/importer.png b/src/main/resources/assets/refinedstorage/textures/gui/importer.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/importer.png rename to src/main/resources/assets/refinedstorage/textures/gui/importer.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/solderer.png b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/solderer.png rename to src/main/resources/assets/refinedstorage/textures/gui/solderer.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/storage.png b/src/main/resources/assets/refinedstorage/textures/gui/storage.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/storage.png rename to src/main/resources/assets/refinedstorage/textures/gui/storage.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/wireless_transmitter.png rename to src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png diff --git a/src/main/resources/assets/storagecraft/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/icons.png rename to src/main/resources/assets/refinedstorage/textures/icons.png diff --git a/src/main/resources/assets/storagecraft/textures/items/16k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/16k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png diff --git a/src/main/resources/assets/storagecraft/textures/items/16k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/16k_storage_part.png rename to src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/1k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/1k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png diff --git a/src/main/resources/assets/storagecraft/textures/items/1k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/1k_storage_part.png rename to src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/4k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/4k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png diff --git a/src/main/resources/assets/storagecraft/textures/items/4k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/4k_storage_part.png rename to src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/64k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/64k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png diff --git a/src/main/resources/assets/storagecraft/textures/items/64k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/64k_storage_part.png rename to src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/advanced_printed_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/advanced_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/basic_printed_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/basic_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/basic_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/blank_pattern.png b/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/blank_pattern.png rename to src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png diff --git a/src/main/resources/assets/storagecraft/textures/items/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/construction_core.png rename to src/main/resources/assets/refinedstorage/textures/items/construction_core.png diff --git a/src/main/resources/assets/storagecraft/textures/items/creative_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/creative_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png diff --git a/src/main/resources/assets/storagecraft/textures/items/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/destruction_core.png rename to src/main/resources/assets/refinedstorage/textures/items/destruction_core.png diff --git a/src/main/resources/assets/storagecraft/textures/items/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/improved_printed_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/improved_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/improved_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/printed_silicon.png rename to src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png diff --git a/src/main/resources/assets/storagecraft/textures/items/quartz_enriched_iron.png b/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/quartz_enriched_iron.png rename to src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png diff --git a/src/main/resources/assets/storagecraft/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/silicon.png rename to src/main/resources/assets/refinedstorage/textures/items/silicon.png diff --git a/src/main/resources/assets/storagecraft/textures/items/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/wireless_grid_connected.png rename to src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png diff --git a/src/main/resources/assets/storagecraft/textures/items/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/wireless_grid_disconnected.png rename to src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png diff --git a/src/main/resources/assets/storagecraft/textures/items/wireless_grid_plate.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/wireless_grid_plate.png rename to src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png diff --git a/src/main/resources/assets/storagecraft/lang/en_US.lang b/src/main/resources/assets/storagecraft/lang/en_US.lang deleted file mode 100644 index 062325e26..000000000 --- a/src/main/resources/assets/storagecraft/lang/en_US.lang +++ /dev/null @@ -1,108 +0,0 @@ -itemGroup.storagecraft=StorageCraft - -gui.storagecraft:controller.0=Controller -gui.storagecraft:controller.1=Creative Controller -gui.storagecraft:grid=Grid -gui.storagecraft:drive=Drive -gui.storagecraft:external_storage=External Storage -gui.storagecraft:importer=Importer -gui.storagecraft:exporter=Exporter -gui.storagecraft:detector=Detector -gui.storagecraft:solderer=Solderer -gui.storagecraft:wireless_transmitter=Wireless Transmitter -gui.storagecraft:destructor=Destructor -gui.storagecraft:constructor=Constructor - -misc.storagecraft:energy_stored=%d / %d RF -misc.storagecraft:energy_usage=Usage: %d RF/t - -misc.storagecraft:storage=Storage -misc.storagecraft:storage.stored=Stored: %d -misc.storagecraft:storage.stored_capacity=Stored: %d / %d -misc.storagecraft:storage.capacity=Capacity: %d -misc.storagecraft:storage.full=%d%% full - -misc.storagecraft:wireless_grid.tooltip=Bound to %d, %d, %d. -misc.storagecraft:wireless_grid.not_working=The Wireless Transmitter is disabled or out of fuel. -misc.storagecraft:wireless_grid.not_found=The Wireless Transmitter is not found. -misc.storagecraft:wireless_grid.not_set.0=This Wireless Grid is not bound to a Wireless Transmitter yet. -misc.storagecraft:wireless_grid.not_set.1=This Wireless Crafting Grid is not bound to a Wireless Transmitter yet. -misc.storagecraft:wireless_grid.out_of_range=The Wireless Transmitter is out of range. -misc.storagecraft:wireless_grid.no_grid.0=There is no Grid found in the network. You need to place a Grid before you can use the Wireless Grid! -misc.storagecraft:wireless_grid.no_grid.1=There is no Crafting Grid found in the network. You need to place a Crafting Grid before you can use the Wireless Crafting Grid! - -misc.storagecraft:yes=Yes -misc.storagecraft:no=No -misc.storagecraft:clear=Clear -misc.storagecraft:priority=Priority - -sidebutton.storagecraft:compare.1=Compare Damage -sidebutton.storagecraft:compare.2=Compare NBT - -sidebutton.storagecraft:redstone_mode=Redstone Mode -sidebutton.storagecraft:redstone_mode.0=Ignore redstone signal -sidebutton.storagecraft:redstone_mode.1=Only work with redstone signal -sidebutton.storagecraft:redstone_mode.2=Only work without redstone signal - -sidebutton.storagecraft:sorting.direction=Sorting Direction -sidebutton.storagecraft:sorting.direction.0=Ascending -sidebutton.storagecraft:sorting.direction.1=Descending - -sidebutton.storagecraft:sorting.type=Sorting Type -sidebutton.storagecraft:sorting.type.0=Quantity -sidebutton.storagecraft:sorting.type.1=Name - -sidebutton.storagecraft:mode=Mode -sidebutton.storagecraft:mode.whitelist=Whitelist -sidebutton.storagecraft:mode.blacklist=Blacklist - -sidebutton.storagecraft:detector.mode=Mode -sidebutton.storagecraft:detector.mode.0=Emit signal when under the amount -sidebutton.storagecraft:detector.mode.1=Emit signal when on the amount -sidebutton.storagecraft:detector.mode.2=Emit signal when above the amount - -block.storagecraft:controller.0.name=Controller -block.storagecraft:controller.1.name=Creative Controller -block.storagecraft:cable.name=Cable -block.storagecraft:grid.0.name=Grid -block.storagecraft:grid.1.name=Crafting Grid -block.storagecraft:drive.name=Drive -block.storagecraft:external_storage.name=External Storage -block.storagecraft:importer.name=Importer -block.storagecraft:exporter.name=Exporter -block.storagecraft:detector.name=Detector -block.storagecraft:machine_casing.name=Machine Casing -block.storagecraft:solderer.name=Solderer -block.storagecraft:wireless_transmitter.name=Wireless Transmitter -block.storagecraft:destructor.name=Destructor -block.storagecraft:constructor.name=Constructor -block.storagecraft:storage.0.name=1k Storage Block -block.storagecraft:storage.1.name=4k Storage Block -block.storagecraft:storage.2.name=16k Storage Block -block.storagecraft:storage.3.name=64k Storage Block -block.storagecraft:storage.4.name=Creative Storage Block -block.storagecraft:crafter.name=Crafter - -item.storagecraft:storage_cell.0.name=1k Storage Cell -item.storagecraft:storage_cell.1.name=4k Storage Cell -item.storagecraft:storage_cell.2.name=16k Storage Cell -item.storagecraft:storage_cell.3.name=64k Storage Cell -item.storagecraft:storage_cell.4.name=Creative Storage Cell -item.storagecraft:wireless_grid.0.name=Wireless Grid -item.storagecraft:wireless_grid.1.name=Wireless Crafting Grid -item.storagecraft:wireless_grid_plate.name=Wireless Grid Plate -item.storagecraft:quartz_enriched_iron.name=Quartz Enriched Iron -item.storagecraft:core.0.name=Construction Core -item.storagecraft:core.1.name=Destruction Core -item.storagecraft:silicon.name=Silicon -item.storagecraft:processor.0.name=Printed Basic Processor -item.storagecraft:processor.1.name=Printed Improved Processor -item.storagecraft:processor.2.name=Printed Advanced Processor -item.storagecraft:processor.3.name=Basic Processor -item.storagecraft:processor.4.name=Improved Processor -item.storagecraft:processor.5.name=Advanced Processor -item.storagecraft:processor.6.name=Printed Silicon -item.storagecraft:storage_part.0.name=1k Storage Part -item.storagecraft:storage_part.1.name=4k Storage Part -item.storagecraft:storage_part.2.name=16k Storage Part -item.storagecraft:storage_part.3.name=64k Storage Part \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/lang/nl_NL.lang b/src/main/resources/assets/storagecraft/lang/nl_NL.lang deleted file mode 100644 index f8fd0d324..000000000 --- a/src/main/resources/assets/storagecraft/lang/nl_NL.lang +++ /dev/null @@ -1,108 +0,0 @@ -itemGroup.storagecraft=StorageCraft - -gui.storagecraft:controller.0=Controller -gui.storagecraft:controller.1=Creative Controller -gui.storagecraft:grid=Rooster -gui.storagecraft:drive=Schijf -gui.storagecraft:external_storage=Externe Opslag -gui.storagecraft:importer=Importeur -gui.storagecraft:exporter=Exporteur -gui.storagecraft:detector=Detector -gui.storagecraft:solderer=Soldeerder -gui.storagecraft:wireless_transmitter=Draadloze Zender -gui.storagecraft:destructor=Destructor -gui.storagecraft:constructor=Constructor -gui.storagecraft:crafter=Crafter - -misc.storagecraft:energy_stored=%d / %d RF -misc.storagecraft:energy_usage=Vebruik: %d RF/t - -misc.storagecraft:storage=Opslag -misc.storagecraft:storage.stored=Opgeslagen: %d -misc.storagecraft:storage.stored_capacity=Opgeslagen: %d / %d -misc.storagecraft:storage.capacity=Capaciteit: %d -misc.storagecraft:storage.full=%d%% vol - -misc.storagecraft:wireless_grid.tooltip=Gebonden aan %d, %d, %d. -misc.storagecraft:wireless_grid.not_working=De Draadloze Zender is uit of zonder brandstof gevallen. -misc.storagecraft:wireless_grid.not_found=De Draadloze Zender werd niet gevonden. -misc.storagecraft:wireless_grid.not_set.0=Dit Draadloos Rooster is nog niet gebonden aan een Draadloze Zender. -misc.storagecraft:wireless_grid.not_set.1=Dit Draadloos Crafting Rooster is nog niet gebonden aan een Draadloze Zender. -misc.storagecraft:wireless_grid.out_of_range=De Draadloze Zender is buiten bereik. -misc.storagecraft:wireless_grid.no_grid.0=Er is geen Rooster gevonden in het netwerk. Je moet eerst een Rooster plaatsen voor je het Draadloze Rooster kunt gebruiken. -misc.storagecraft:wireless_grid.no_grid.1=Er is geen Crafting Rooster gevonden in het netwerk. Je moet eerst een Crafting Rooster plaatsen voor je het Draadloze Crafting Rooster kunt gebruiken. - -misc.storagecraft:yes=Ja -misc.storagecraft:no=Nee -misc.storagecraft:clear=Legen -misc.storagecraft:priority=Prioriteit - -sidebutton.storagecraft:compare.1=Vergelijken op damage -sidebutton.storagecraft:compare.2=Vergelijken op NBT - -sidebutton.storagecraft:redstone_mode=Redstone Mode -sidebutton.storagecraft:redstone_mode.0=Redstone negeren -sidebutton.storagecraft:redstone_mode.1=Alleen werken met redstone signaal -sidebutton.storagecraft:redstone_mode.2=Alleen werken zonder redstone signaal - -sidebutton.storagecraft:sorting.direction=Sorteer Richting -sidebutton.storagecraft:sorting.direction.0=Oplopend -sidebutton.storagecraft:sorting.direction.1=Aflopend - -sidebutton.storagecraft:sorting.type=Sorteer Type -sidebutton.storagecraft:sorting.type.0=Hoeveelheid -sidebutton.storagecraft:sorting.type.1=Naam - -sidebutton.storagecraft:mode=Mode -sidebutton.storagecraft:mode.whitelist=Whitelist -sidebutton.storagecraft:mode.blacklist=Blacklist - -sidebutton.storagecraft:detector.mode=Mode -sidebutton.storagecraft:detector.mode.0=Redstone signaal aan wanneer onder het aantal -sidebutton.storagecraft:detector.mode.1=Redstone signaal aan wanneer op het aantal -sidebutton.storagecraft:detector.mode.2=Redstone signaal aan wanneer boven het aantal - -block.storagecraft:controller.0.name=Controller -block.storagecraft:controller.1.name=Creative Controller -block.storagecraft:cable.name=Kabel -block.storagecraft:grid.0.name=Rooster -block.storagecraft:grid.1.name=Crafting Rooster -block.storagecraft:drive.name=Schijf -block.storagecraft:external_storage.name=Externe Opslag -block.storagecraft:importer.name=Importeur -block.storagecraft:exporter.name=Exporteur -block.storagecraft:detector.name=Detector -block.storagecraft:machine_casing.name=Machine-omhulsel -block.storagecraft:solderer.name=Soldeerder -block.storagecraft:wireless_transmitter.name=Draadloze Zender -block.storagecraft:destructor.name=Destructor -block.storagecraft:constructor.name=Constructor -block.storagecraft:storage.0.name=1k Opslag Blok -block.storagecraft:storage.1.name=4k Opslag Blok -block.storagecraft:storage.2.name=16k Opslag Blok -block.storagecraft:storage.3.name=64k Opslag Blok -block.storagecraft:storage.4.name=Creative Opslag Blok - -item.storagecraft:storage_cell.0.name=1k Opslagcel -item.storagecraft:storage_cell.1.name=4k Opslagcel -item.storagecraft:storage_cell.2.name=16k Opslagcel -item.storagecraft:storage_cell.3.name=64k Opslagcel -item.storagecraft:storage_cell.4.name=Creative Opslagcel -item.storagecraft:wireless_grid.0.name=Draadloze Rooster -item.storagecraft:wireless_grid.1.name=Draadloze Crafting Rooster -item.storagecraft:wireless_grid_plate.name=Draadloze Rooster Bord -item.storagecraft:quartz_enriched_iron.name=Quartz Verrijkt Iron -item.storagecraft:core.0.name=Constructie Core -item.storagecraft:core.1.name=Destructie Core -item.storagecraft:silicon.name=Silicon -item.storagecraft:processor.0.name=Gedrukte Basis Processor -item.storagecraft:processor.1.name=Gedrukte Verbeterde Processor -item.storagecraft:processor.2.name=Gedrukte Uitgebreide Processor -item.storagecraft:processor.3.name=Basis Processor -item.storagecraft:processor.4.name=Verbeterde Processor -item.storagecraft:processor.5.name=Uitgebreide Processor -item.storagecraft:processor.6.name=Gedrukte Silicon -item.storagecraft:storage_part.0.name=1k Opslagdeel -item.storagecraft:storage_part.1.name=4k Opslagdeel -item.storagecraft:storage_part.2.name=16k Opslagdeel -item.storagecraft:storage_part.3.name=64k Opslagdeel \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/models/item/16k_storage_cell.json b/src/main/resources/assets/storagecraft/models/item/16k_storage_cell.json deleted file mode 100644 index a91ae9f3e..000000000 --- a/src/main/resources/assets/storagecraft/models/item/16k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/16k_storage_cell" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json deleted file mode 100644 index f67fc5874..000000000 --- a/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/16k_storage_part" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/64k_storage_cell.json b/src/main/resources/assets/storagecraft/models/item/64k_storage_cell.json deleted file mode 100644 index f0ebbf320..000000000 --- a/src/main/resources/assets/storagecraft/models/item/64k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/64k_storage_cell" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json deleted file mode 100644 index 9f631c484..000000000 --- a/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/64k_storage_part" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json deleted file mode 100644 index 5a2a58184..000000000 --- a/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/advanced_printed_processor" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/advanced_processor.json b/src/main/resources/assets/storagecraft/models/item/advanced_processor.json deleted file mode 100644 index 2584ca5b7..000000000 --- a/src/main/resources/assets/storagecraft/models/item/advanced_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/advanced_processor" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json deleted file mode 100644 index 6afe39ef1..000000000 --- a/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/basic_printed_processor" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/construction_core.json b/src/main/resources/assets/storagecraft/models/item/construction_core.json deleted file mode 100644 index 3c0f6038a..000000000 --- a/src/main/resources/assets/storagecraft/models/item/construction_core.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/construction_core" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/creative_storage_cell.json b/src/main/resources/assets/storagecraft/models/item/creative_storage_cell.json deleted file mode 100644 index d73a6ed23..000000000 --- a/src/main/resources/assets/storagecraft/models/item/creative_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/creative_storage_cell" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/destruction_core.json b/src/main/resources/assets/storagecraft/models/item/destruction_core.json deleted file mode 100644 index b0ad94b8e..000000000 --- a/src/main/resources/assets/storagecraft/models/item/destruction_core.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/destruction_core" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json deleted file mode 100644 index 27eb16e67..000000000 --- a/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/improved_printed_processor" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/improved_processor.json b/src/main/resources/assets/storagecraft/models/item/improved_processor.json deleted file mode 100644 index 02c58b8af..000000000 --- a/src/main/resources/assets/storagecraft/models/item/improved_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/improved_processor" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json b/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json deleted file mode 100644 index d09d378ac..000000000 --- a/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/quartz_enriched_iron" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/wireless_grid_connected.json b/src/main/resources/assets/storagecraft/models/item/wireless_grid_connected.json deleted file mode 100644 index 5ece6a6af..000000000 --- a/src/main/resources/assets/storagecraft/models/item/wireless_grid_connected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/wireless_grid_connected" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/wireless_grid_disconnected.json b/src/main/resources/assets/storagecraft/models/item/wireless_grid_disconnected.json deleted file mode 100644 index e28d9d0b3..000000000 --- a/src/main/resources/assets/storagecraft/models/item/wireless_grid_disconnected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/wireless_grid_disconnected" - } -} diff --git a/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json b/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json deleted file mode 100644 index a922419be..000000000 --- a/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "storagecraft:items/wireless_grid_plate" - } -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 1c2a73c6d..3679faa0f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [ { - "modid": "storagecraft", - "name": "StorageCraft", + "modid": "refinedstorage", + "name": "Refined Storage", "description": "A Minecraft mod all about storage.", "version": "0.3", "mcversion": "1.9",