dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add crafting unit, remove creative crafting CPU

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-12 18:39:58 +02:00
parent 7194cb1743
commit 9874814303
12 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/refinedstorage/RefinedStorageBlocks.java
View File

@@ -21,4 +21,5 @@ public final class RefinedStorageBlocks {
public static final BlockCraftingMonitor CRAFTING_MONITOR = new BlockCraftingMonitor();
public static final BlockCraftingCPU CRAFTING_CPU = new BlockCraftingCPU();
public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter();
public static final BlockCraftingUnit CRAFTING_UNIT = new BlockCraftingUnit();
}

8
src/main/java/refinedstorage/block/BlockCraftingCPU.java
View File

@@ -16,7 +16,7 @@ import refinedstorage.tile.autocrafting.TileCraftingCPU;
import java.util.List;
public class BlockCraftingCPU extends BlockMachine {
public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class);
public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumCraftingCPUType.class);
public BlockCraftingCPU() {
super("crafting_cpu");
@@ -24,7 +24,7 @@ public class BlockCraftingCPU extends BlockMachine {
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List subItems) {
for (int i = 0; i <= 4; ++i) {
for (int i = 0; i <= 3; ++i) {
subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i)));
}
}
@@ -40,12 +40,12 @@ public class BlockCraftingCPU extends BlockMachine {
@Override
public IBlockState getStateFromMeta(int meta) {
return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta));
return getDefaultState().withProperty(TYPE, EnumCraftingCPUType.getById(meta));
}
@Override
public int getMetaFromState(IBlockState state) {
return ((EnumStorageType) state.getValue(TYPE)).getId();
return ((EnumCraftingCPUType) state.getValue(TYPE)).getId();
}
@Override

7
src/main/java/refinedstorage/block/BlockCraftingUnit.java Executable file
View File

@@ -0,0 +1,7 @@
package refinedstorage.block;
public class BlockCraftingUnit extends BlockBase {
public BlockCraftingUnit() {
super("crafting_unit");
}
}

41
src/main/java/refinedstorage/block/EnumCraftingCPUType.java Executable file
View File

@@ -0,0 +1,41 @@
package refinedstorage.block;
import net.minecraft.util.IStringSerializable;
public enum EnumCraftingCPUType implements IStringSerializable {
TYPE_1K(0, "1k"),
TYPE_4K(1, "4k"),
TYPE_16K(2, "16k"),
TYPE_64K(3, "64k");
private int id;
private String name;
EnumCraftingCPUType(int id, String name) {
this.id = id;
this.name = name;
}
@Override
public String getName() {
return name;
}
public int getId() {
return id;
}
@Override
public String toString() {
return name;
}
public static EnumCraftingCPUType getById(int id) {
for (EnumCraftingCPUType type : EnumCraftingCPUType.values()) {
if (type.getId() == id) {
return type;
}
}
return TYPE_1K;
}
}

16
src/main/java/refinedstorage/proxy/ClientProxy.java
View File

@@ -10,6 +10,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.block.EnumControllerType;
import refinedstorage.block.EnumCraftingCPUType;
import refinedstorage.block.EnumGridType;
import refinedstorage.block.EnumStorageType;
import refinedstorage.item.*;
@@ -119,8 +120,8 @@ public class ClientProxy extends CommonProxy {
);
ModelLoader.setCustomStateMapper(RefinedStorageBlocks.CRAFTING_CPU, (new StateMap.Builder())
.ignore(RefinedStorageBlocks.STORAGE.DIRECTION)
.ignore(RefinedStorageBlocks.STORAGE.CONNECTED)
.ignore(RefinedStorageBlocks.CRAFTING_CPU.DIRECTION)
.ignore(RefinedStorageBlocks.CRAFTING_CPU.CONNECTED)
.build()
);
@@ -130,10 +131,11 @@ public class ClientProxy extends CommonProxy {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=1k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=4k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=16k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=64k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=creative"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_UNIT), 0, new ModelResourceLocation("refinedstorage:crafting_unit", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=1k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=4k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=16k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumCraftingCPUType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=64k"));
}
}

1
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -91,6 +91,7 @@ public class CommonProxy {
registerBlock(RefinedStorageBlocks.CRAFTING_MONITOR);
registerBlock(RefinedStorageBlocks.CRAFTING_CPU);
registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER);
registerBlock(RefinedStorageBlocks.CRAFTING_UNIT);
registerItem(RefinedStorageItems.STORAGE_DISK);
registerItem(RefinedStorageItems.PATTERN);