Add processors and silicon. Add recipes for everything too.
This commit is contained in:
@@ -9,6 +9,12 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
url = "https://dvs1.progwml6.com/files/maven/"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle'
|
apply plugin: 'net.minecraftforge.gradle'
|
||||||
apply plugin: 'eclipse'
|
apply plugin: 'eclipse'
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
@@ -75,6 +81,8 @@ processResources {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft 'net.minecraftforge:forge:1.14.4-28.0.73'
|
minecraft 'net.minecraftforge:forge:1.14.4-28.0.73'
|
||||||
|
compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api")
|
||||||
|
runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11")
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
@@ -1,8 +1,6 @@
|
|||||||
package com.raoulvdberge.refinedstorage;
|
package com.raoulvdberge.refinedstorage;
|
||||||
|
|
||||||
import com.raoulvdberge.refinedstorage.item.ItemCore;
|
import com.raoulvdberge.refinedstorage.item.*;
|
||||||
import com.raoulvdberge.refinedstorage.item.ItemProcessorBinding;
|
|
||||||
import com.raoulvdberge.refinedstorage.item.ItemQuartzEnrichedIron;
|
|
||||||
import com.raoulvdberge.refinedstorage.item.group.MainItemGroup;
|
import com.raoulvdberge.refinedstorage.item.group.MainItemGroup;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
@@ -36,6 +34,15 @@ public final class RS {
|
|||||||
e.getRegistry().register(new ItemCore(ItemCore.Type.DESTRUCTION));
|
e.getRegistry().register(new ItemCore(ItemCore.Type.DESTRUCTION));
|
||||||
e.getRegistry().register(new ItemQuartzEnrichedIron());
|
e.getRegistry().register(new ItemQuartzEnrichedIron());
|
||||||
e.getRegistry().register(new ItemProcessorBinding());
|
e.getRegistry().register(new ItemProcessorBinding());
|
||||||
|
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.RAW_BASIC));
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.RAW_IMPROVED));
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.RAW_ADVANCED));
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.BASIC));
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.IMPROVED));
|
||||||
|
e.getRegistry().register(new ItemProcessor(ItemProcessor.Type.ADVANCED));
|
||||||
|
|
||||||
|
e.getRegistry().register(new ItemSilicon());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO
|
/* TODO
|
||||||
|
@@ -5,56 +5,55 @@ import com.raoulvdberge.refinedstorage.container.factory.TileContainerFactory;
|
|||||||
import net.minecraft.inventory.container.ContainerType;
|
import net.minecraft.inventory.container.ContainerType;
|
||||||
import net.minecraftforge.common.extensions.IForgeContainerType;
|
import net.minecraftforge.common.extensions.IForgeContainerType;
|
||||||
import net.minecraftforge.event.RegistryEvent;
|
import net.minecraftforge.event.RegistryEvent;
|
||||||
import net.minecraftforge.registries.ObjectHolder;
|
|
||||||
|
|
||||||
public final class RSContainers {
|
public final class RSContainers {
|
||||||
@ObjectHolder(RS.ID + ":constructor")
|
//@ObjectHolder(RS.ID + ":constructor")
|
||||||
public static final ContainerType<ContainerConstructor> CONSTRUCTOR = null;
|
public static final ContainerType<ContainerConstructor> CONSTRUCTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":controller")
|
//@ObjectHolder(RS.ID + ":controller")
|
||||||
public static final ContainerType<ContainerController> CONTROLLER = null;
|
public static final ContainerType<ContainerController> CONTROLLER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafter")
|
//@ObjectHolder(RS.ID + ":crafter")
|
||||||
public static final ContainerType<ContainerCrafter> CRAFTER = null;
|
public static final ContainerType<ContainerCrafter> CRAFTER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafter_manager")
|
//@ObjectHolder(RS.ID + ":crafter_manager")
|
||||||
public static final ContainerType<ContainerCrafter> CRAFTER_MANAGER = null;
|
public static final ContainerType<ContainerCrafter> CRAFTER_MANAGER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafting_monitor")
|
//@ObjectHolder(RS.ID + ":crafting_monitor")
|
||||||
public static final ContainerType<ContainerCraftingMonitor> CRAFTING_MONITOR = null;
|
public static final ContainerType<ContainerCraftingMonitor> CRAFTING_MONITOR = null;
|
||||||
@ObjectHolder(RS.ID + ":destructor")
|
//@ObjectHolder(RS.ID + ":destructor")
|
||||||
public static final ContainerType<ContainerDestructor> DESTRUCTOR = null;
|
public static final ContainerType<ContainerDestructor> DESTRUCTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":detector")
|
//@ObjectHolder(RS.ID + ":detector")
|
||||||
public static final ContainerType<ContainerDetector> DETECTOR = null;
|
public static final ContainerType<ContainerDetector> DETECTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":disk_drive")
|
//@ObjectHolder(RS.ID + ":disk_drive")
|
||||||
public static final ContainerType<ContainerDiskDrive> DISK_DRIVE = null;
|
public static final ContainerType<ContainerDiskDrive> DISK_DRIVE = null;
|
||||||
@ObjectHolder(RS.ID + ":disk_manipulator")
|
//@ObjectHolder(RS.ID + ":disk_manipulator")
|
||||||
public static final ContainerType<ContainerDiskManipulator> DISK_MANIPULATOR = null;
|
public static final ContainerType<ContainerDiskManipulator> DISK_MANIPULATOR = null;
|
||||||
@ObjectHolder(RS.ID + ":exporter")
|
//@ObjectHolder(RS.ID + ":exporter")
|
||||||
public static final ContainerType<ContainerExporter> EXPORTER = null;
|
public static final ContainerType<ContainerExporter> EXPORTER = null;
|
||||||
@ObjectHolder(RS.ID + ":external_storage")
|
//@ObjectHolder(RS.ID + ":external_storage")
|
||||||
public static final ContainerType<ContainerExternalStorage> EXTERNAL_STORAGE = null;
|
public static final ContainerType<ContainerExternalStorage> EXTERNAL_STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":filter")
|
//@ObjectHolder(RS.ID + ":filter")
|
||||||
public static final ContainerType<ContainerFilter> FILTER = null;
|
public static final ContainerType<ContainerFilter> FILTER = null;
|
||||||
@ObjectHolder(RS.ID + ":fluid_interface")
|
//@ObjectHolder(RS.ID + ":fluid_interface")
|
||||||
public static final ContainerType<ContainerFluidInterface> FLUID_INTERFACE = null;
|
public static final ContainerType<ContainerFluidInterface> FLUID_INTERFACE = null;
|
||||||
@ObjectHolder(RS.ID + ":fluid_storage")
|
//@ObjectHolder(RS.ID + ":fluid_storage")
|
||||||
public static final ContainerType<ContainerFluidInterface> FLUID_STORAGE = null;
|
public static final ContainerType<ContainerFluidInterface> FLUID_STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":grid")
|
//@ObjectHolder(RS.ID + ":grid")
|
||||||
public static final ContainerType<ContainerGrid> GRID = null;
|
public static final ContainerType<ContainerGrid> GRID = null;
|
||||||
@ObjectHolder(RS.ID + ":importer")
|
//@ObjectHolder(RS.ID + ":importer")
|
||||||
public static final ContainerType<ContainerImporter> IMPORTER = null;
|
public static final ContainerType<ContainerImporter> IMPORTER = null;
|
||||||
@ObjectHolder(RS.ID + ":interface")
|
//@ObjectHolder(RS.ID + ":interface")
|
||||||
public static final ContainerType<ContainerImporter> INTERFACE = null;
|
public static final ContainerType<ContainerImporter> INTERFACE = null;
|
||||||
@ObjectHolder(RS.ID + ":network_transmitter")
|
//@ObjectHolder(RS.ID + ":network_transmitter")
|
||||||
public static final ContainerType<ContainerNetworkTransmitter> NETWORK_TRANSMITTER = null;
|
public static final ContainerType<ContainerNetworkTransmitter> NETWORK_TRANSMITTER = null;
|
||||||
@ObjectHolder(RS.ID + ":reader_writer")
|
//@ObjectHolder(RS.ID + ":reader_writer")
|
||||||
public static final ContainerType<ContainerReaderWriter> READER_WRITER = null;
|
public static final ContainerType<ContainerReaderWriter> READER_WRITER = null;
|
||||||
@ObjectHolder(RS.ID + ":relay")
|
//@ObjectHolder(RS.ID + ":relay")
|
||||||
public static final ContainerType<ContainerRelay> RELAY = null;
|
public static final ContainerType<ContainerRelay> RELAY = null;
|
||||||
@ObjectHolder(RS.ID + ":security_manager")
|
//@ObjectHolder(RS.ID + ":security_manager")
|
||||||
public static final ContainerType<ContainerSecurityManager> SECURITY_MANAGER = null;
|
public static final ContainerType<ContainerSecurityManager> SECURITY_MANAGER = null;
|
||||||
@ObjectHolder(RS.ID + ":storage")
|
//@ObjectHolder(RS.ID + ":storage")
|
||||||
public static final ContainerType<ContainerStorage> STORAGE = null;
|
public static final ContainerType<ContainerStorage> STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":storage_monitor")
|
//@ObjectHolder(RS.ID + ":storage_monitor")
|
||||||
public static final ContainerType<ContainerStorageMonitor> STORAGE_MONITOR = null;
|
public static final ContainerType<ContainerStorageMonitor> STORAGE_MONITOR = null;
|
||||||
@ObjectHolder(RS.ID + ":wireless_transmitter")
|
//@ObjectHolder(RS.ID + ":wireless_transmitter")
|
||||||
public static final ContainerType<ContainerSecurityManager> WIRELESS_TRANSMITTER = null;
|
public static final ContainerType<ContainerSecurityManager> WIRELESS_TRANSMITTER = null;
|
||||||
|
|
||||||
public void registerContainers(final RegistryEvent.Register<ContainerType<?>> event) {
|
public void registerContainers(final RegistryEvent.Register<ContainerType<?>> event) {
|
||||||
|
@@ -10,10 +10,24 @@ public final class RSItems {
|
|||||||
public static final ItemWirelessCraftingMonitor WIRELESS_CRAFTING_MONITOR = new ItemWirelessCraftingMonitor();
|
public static final ItemWirelessCraftingMonitor WIRELESS_CRAFTING_MONITOR = new ItemWirelessCraftingMonitor();
|
||||||
@ObjectHolder(RS.ID + ":quartz_enriched_iron")
|
@ObjectHolder(RS.ID + ":quartz_enriched_iron")
|
||||||
public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = null;
|
public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = null;
|
||||||
@ObjectHolder(RS.ID + ":core")
|
@ObjectHolder(RS.ID + ":construction_core")
|
||||||
public static final ItemCore CORE = null;
|
public static final ItemCore CONSTRUCTION_CORE = null;
|
||||||
public static final ItemSilicon SILICON = new ItemSilicon();
|
@ObjectHolder(RS.ID + ":destruction_core")
|
||||||
public static final ItemProcessor PROCESSOR = new ItemProcessor();
|
public static final ItemCore DESTRUCTION_CORE = null;
|
||||||
|
@ObjectHolder(RS.ID + ":silicon")
|
||||||
|
public static final ItemSilicon SILICON = null;
|
||||||
|
@ObjectHolder(RS.ID + ":raw_basic_processor")
|
||||||
|
public static final ItemProcessor RAW_BASIC_PROCESSOR = null;
|
||||||
|
@ObjectHolder(RS.ID + ":raw_improved_processor")
|
||||||
|
public static final ItemProcessor RAW_IMPROVED_PROCESSOR = null;
|
||||||
|
@ObjectHolder(RS.ID + ":raw_advanced_processor")
|
||||||
|
public static final ItemProcessor RAW_ADVANCED_PROCESSOR = null;
|
||||||
|
@ObjectHolder(RS.ID + ":basic_processor")
|
||||||
|
public static final ItemProcessor BASIC_PROCESSOR = null;
|
||||||
|
@ObjectHolder(RS.ID + ":improved_processor")
|
||||||
|
public static final ItemProcessor IMPROVED_PROCESSOR = null;
|
||||||
|
@ObjectHolder(RS.ID + ":advanced_processor")
|
||||||
|
public static final ItemProcessor ADVANCED_PROCESSOR = null;
|
||||||
public static final ItemStoragePart STORAGE_PART = new ItemStoragePart();
|
public static final ItemStoragePart STORAGE_PART = new ItemStoragePart();
|
||||||
public static final ItemPattern PATTERN = new ItemPattern();
|
public static final ItemPattern PATTERN = new ItemPattern();
|
||||||
public static final ItemUpgrade UPGRADE = new ItemUpgrade();
|
public static final ItemUpgrade UPGRADE = new ItemUpgrade();
|
||||||
|
@@ -5,61 +5,60 @@ import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor;
|
|||||||
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
|
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
|
||||||
import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
|
import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
|
||||||
import net.minecraft.tileentity.TileEntityType;
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
import net.minecraftforge.registries.ObjectHolder;
|
|
||||||
|
|
||||||
public class RSTiles {
|
public class RSTiles {
|
||||||
@ObjectHolder(RS.ID + ":constructor")
|
//@ObjectHolder(RS.ID + ":constructor")
|
||||||
public static final TileEntityType<TileConstructor> CONSTRUCTOR = null;
|
public static final TileEntityType<TileConstructor> CONSTRUCTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":controller")
|
//@ObjectHolder(RS.ID + ":controller")
|
||||||
public static final TileEntityType<TileController> CONTROLLER = null;
|
public static final TileEntityType<TileController> CONTROLLER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafter")
|
//@ObjectHolder(RS.ID + ":crafter")
|
||||||
public static final TileEntityType<TileCrafter> CRAFTER = null;
|
public static final TileEntityType<TileCrafter> CRAFTER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafter_manager")
|
//@ObjectHolder(RS.ID + ":crafter_manager")
|
||||||
public static final TileEntityType<TileCrafter> CRAFTER_MANAGER = null;
|
public static final TileEntityType<TileCrafter> CRAFTER_MANAGER = null;
|
||||||
@ObjectHolder(RS.ID + ":crafting_monitor")
|
//@ObjectHolder(RS.ID + ":crafting_monitor")
|
||||||
public static final TileEntityType<TileCraftingMonitor> CRAFTING_MONITOR = null;
|
public static final TileEntityType<TileCraftingMonitor> CRAFTING_MONITOR = null;
|
||||||
@ObjectHolder(RS.ID + ":destructor")
|
//@ObjectHolder(RS.ID + ":destructor")
|
||||||
public static final TileEntityType<TileDestructor> DESTRUCTOR = null;
|
public static final TileEntityType<TileDestructor> DESTRUCTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":detector")
|
//@ObjectHolder(RS.ID + ":detector")
|
||||||
public static final TileEntityType<TileDetector> DETECTOR = null;
|
public static final TileEntityType<TileDetector> DETECTOR = null;
|
||||||
@ObjectHolder(RS.ID + ":disk_drive")
|
//@ObjectHolder(RS.ID + ":disk_drive")
|
||||||
public static final TileEntityType<TileDiskDrive> DISK_DRIVE = null;
|
public static final TileEntityType<TileDiskDrive> DISK_DRIVE = null;
|
||||||
@ObjectHolder(RS.ID + ":disk_manipulator")
|
//@ObjectHolder(RS.ID + ":disk_manipulator")
|
||||||
public static final TileEntityType<TileDiskManipulator> DISK_MANIPULATOR = null;
|
public static final TileEntityType<TileDiskManipulator> DISK_MANIPULATOR = null;
|
||||||
@ObjectHolder(RS.ID + ":exporter")
|
//@ObjectHolder(RS.ID + ":exporter")
|
||||||
public static final TileEntityType<TileExporter> EXPORTER = null;
|
public static final TileEntityType<TileExporter> EXPORTER = null;
|
||||||
@ObjectHolder(RS.ID + ":external_storage")
|
//@ObjectHolder(RS.ID + ":external_storage")
|
||||||
public static final TileEntityType<TileExternalStorage> EXTERNAL_STORAGE = null;
|
public static final TileEntityType<TileExternalStorage> EXTERNAL_STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":fluid_interface")
|
//@ObjectHolder(RS.ID + ":fluid_interface")
|
||||||
public static final TileEntityType<TileFluidInterface> FLUID_INTERFACE = null;
|
public static final TileEntityType<TileFluidInterface> FLUID_INTERFACE = null;
|
||||||
@ObjectHolder(RS.ID + ":fluid_storage")
|
//@ObjectHolder(RS.ID + ":fluid_storage")
|
||||||
public static final TileEntityType<TileFluidInterface> FLUID_STORAGE = null;
|
public static final TileEntityType<TileFluidInterface> FLUID_STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":grid")
|
//@ObjectHolder(RS.ID + ":grid")
|
||||||
public static final TileEntityType<TileGrid> GRID = null;
|
public static final TileEntityType<TileGrid> GRID = null;
|
||||||
@ObjectHolder(RS.ID + ":importer")
|
//@ObjectHolder(RS.ID + ":importer")
|
||||||
public static final TileEntityType<TileImporter> IMPORTER = null;
|
public static final TileEntityType<TileImporter> IMPORTER = null;
|
||||||
@ObjectHolder(RS.ID + ":interface")
|
//@ObjectHolder(RS.ID + ":interface")
|
||||||
public static final TileEntityType<TileImporter> INTERFACE = null;
|
public static final TileEntityType<TileImporter> INTERFACE = null;
|
||||||
@ObjectHolder(RS.ID + ":network_transmitter")
|
//@ObjectHolder(RS.ID + ":network_transmitter")
|
||||||
public static final TileEntityType<TileNetworkTransmitter> NETWORK_TRANSMITTER = null;
|
public static final TileEntityType<TileNetworkTransmitter> NETWORK_TRANSMITTER = null;
|
||||||
@ObjectHolder(RS.ID + ":network_receiver")
|
//@ObjectHolder(RS.ID + ":network_receiver")
|
||||||
public static final TileEntityType<TileNetworkReceiver> NETWORK_RECEIVER = null;
|
public static final TileEntityType<TileNetworkReceiver> NETWORK_RECEIVER = null;
|
||||||
@ObjectHolder(RS.ID + ":reader")
|
//@ObjectHolder(RS.ID + ":reader")
|
||||||
public static final TileEntityType<TileReader> READER = null;
|
public static final TileEntityType<TileReader> READER = null;
|
||||||
@ObjectHolder(RS.ID + ":writer")
|
//@ObjectHolder(RS.ID + ":writer")
|
||||||
public static final TileEntityType<TileWriter> WRITER = null;
|
public static final TileEntityType<TileWriter> WRITER = null;
|
||||||
@ObjectHolder(RS.ID + ":relay")
|
//@ObjectHolder(RS.ID + ":relay")
|
||||||
public static final TileEntityType<TileRelay> RELAY = null;
|
public static final TileEntityType<TileRelay> RELAY = null;
|
||||||
@ObjectHolder(RS.ID + ":security_manager")
|
//@ObjectHolder(RS.ID + ":security_manager")
|
||||||
public static final TileEntityType<TileSecurityManager> SECURITY_MANAGER = null;
|
public static final TileEntityType<TileSecurityManager> SECURITY_MANAGER = null;
|
||||||
@ObjectHolder(RS.ID + ":storage")
|
//@ObjectHolder(RS.ID + ":storage")
|
||||||
public static final TileEntityType<TileStorage> STORAGE = null;
|
public static final TileEntityType<TileStorage> STORAGE = null;
|
||||||
@ObjectHolder(RS.ID + ":storage_monitor")
|
//@ObjectHolder(RS.ID + ":storage_monitor")
|
||||||
public static final TileEntityType<TileStorageMonitor> STORAGE_MONITOR = null;
|
public static final TileEntityType<TileStorageMonitor> STORAGE_MONITOR = null;
|
||||||
@ObjectHolder(RS.ID + ":wireless_transmitter")
|
//@ObjectHolder(RS.ID + ":wireless_transmitter")
|
||||||
public static final TileEntityType<TileSecurityManager> WIRELESS_TRANSMITTER = null;
|
public static final TileEntityType<TileSecurityManager> WIRELESS_TRANSMITTER = null;
|
||||||
@ObjectHolder(RS.ID + ":cable")
|
//@ObjectHolder(RS.ID + ":cable")
|
||||||
public static final TileEntityType<TileCable> CABLE = null;
|
public static final TileEntityType<TileCable> CABLE = null;
|
||||||
@ObjectHolder(RS.ID + ":portable_grid")
|
//@ObjectHolder(RS.ID + ":portable_grid")
|
||||||
public static final TileEntityType<TilePortableGrid> PORTABLE_GRID = null;
|
public static final TileEntityType<TilePortableGrid> PORTABLE_GRID = null;
|
||||||
}
|
}
|
||||||
|
@@ -1,52 +1,28 @@
|
|||||||
package com.raoulvdberge.refinedstorage.item;
|
package com.raoulvdberge.refinedstorage.item;
|
||||||
|
|
||||||
import com.raoulvdberge.refinedstorage.RS;
|
import com.raoulvdberge.refinedstorage.RS;
|
||||||
import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
public class ItemProcessor extends ItemBase {
|
public class ItemProcessor extends Item {
|
||||||
public static final int TYPE_CUT_BASIC = 0;
|
public enum Type {
|
||||||
public static final int TYPE_CUT_IMPROVED = 1;
|
|
||||||
public static final int TYPE_CUT_ADVANCED = 2;
|
|
||||||
public static final int TYPE_BASIC = 3;
|
|
||||||
public static final int TYPE_IMPROVED = 4;
|
|
||||||
public static final int TYPE_ADVANCED = 5;
|
|
||||||
|
|
||||||
public ItemProcessor() {
|
RAW_BASIC("raw_basic"),
|
||||||
super(new ItemInfo(RS.ID, "processor"));
|
RAW_IMPROVED("raw_improved"),
|
||||||
|
RAW_ADVANCED("raw_advanced"),
|
||||||
|
BASIC("basic"),
|
||||||
|
IMPROVED("improved"),
|
||||||
|
ADVANCED("advanced");
|
||||||
|
|
||||||
//setHasSubtypes(true);
|
final String name;
|
||||||
//setMaxDamage(0);
|
|
||||||
|
Type(String name) {
|
||||||
|
this.name = name;
|
||||||
}
|
}
|
||||||
/* TODO
|
|
||||||
@Override
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public void registerModels(IModelRegistration modelRegistration) {
|
|
||||||
modelRegistration.setModelVariants(
|
|
||||||
this,
|
|
||||||
new ResourceLocation(RS.ID, "raw_basic_processor"),
|
|
||||||
new ResourceLocation(RS.ID, "raw_improved_processor"),
|
|
||||||
new ResourceLocation(RS.ID, "raw_advanced_processor"),
|
|
||||||
new ResourceLocation(RS.ID, "basic_processor"),
|
|
||||||
new ResourceLocation(RS.ID, "improved_processor"),
|
|
||||||
new ResourceLocation(RS.ID, "advanced_processor")
|
|
||||||
);
|
|
||||||
|
|
||||||
modelRegistration.setModel(this, TYPE_CUT_BASIC, new ModelResourceLocation(RS.ID + ":raw_basic_processor", "inventory"));
|
|
||||||
modelRegistration.setModel(this, TYPE_CUT_IMPROVED, new ModelResourceLocation(RS.ID + ":raw_improved_processor", "inventory"));
|
|
||||||
modelRegistration.setModel(this, TYPE_CUT_ADVANCED, new ModelResourceLocation(RS.ID + ":raw_advanced_processor", "inventory"));
|
|
||||||
modelRegistration.setModel(this, TYPE_BASIC, new ModelResourceLocation(RS.ID + ":basic_processor", "inventory"));
|
|
||||||
modelRegistration.setModel(this, TYPE_IMPROVED, new ModelResourceLocation(RS.ID + ":improved_processor", "inventory"));
|
|
||||||
modelRegistration.setModel(this, TYPE_ADVANCED, new ModelResourceLocation(RS.ID + ":advanced_processor", "inventory"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public ItemProcessor(Type type) {
|
||||||
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
|
super(new Item.Properties().group(RS.MAIN_GROUP));
|
||||||
if (!isInCreativeTab(tab)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i <= 5; ++i) {
|
this.setRegistryName(RS.ID, type.name + "_processor");
|
||||||
items.add(new ItemStack(this, 1, i));
|
|
||||||
}
|
}
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
@@ -1,16 +1,12 @@
|
|||||||
package com.raoulvdberge.refinedstorage.item;
|
package com.raoulvdberge.refinedstorage.item;
|
||||||
|
|
||||||
import com.raoulvdberge.refinedstorage.RS;
|
import com.raoulvdberge.refinedstorage.RS;
|
||||||
import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
public class ItemSilicon extends ItemBase {
|
public class ItemSilicon extends Item {
|
||||||
public ItemSilicon() {
|
public ItemSilicon() {
|
||||||
super(new ItemInfo(RS.ID, "silicon"));
|
super(new Item.Properties().group(RS.MAIN_GROUP));
|
||||||
|
|
||||||
|
this.setRegistryName(RS.ID, "silicon");
|
||||||
}
|
}
|
||||||
/* TODO
|
|
||||||
@Override
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public void registerModels(IModelRegistration modelRegistration) {
|
|
||||||
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
@@ -175,12 +175,6 @@ public class ProxyCommon {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void init(FMLInitializationEvent e) {
|
public void init(FMLInitializationEvent e) {
|
||||||
GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5F);
|
|
||||||
|
|
||||||
GameRegistry.addSmelting(new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_CUT_BASIC), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), 0.5F);
|
|
||||||
GameRegistry.addSmelting(new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_CUT_IMPROVED), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), 0.5F);
|
|
||||||
GameRegistry.addSmelting(new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_CUT_ADVANCED), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), 0.5F);
|
|
||||||
|
|
||||||
if (IntegrationOC.isLoaded()) {
|
if (IntegrationOC.isLoaded()) {
|
||||||
DriverNetwork.register();
|
DriverNetwork.register();
|
||||||
}
|
}
|
||||||
|
@@ -242,13 +242,13 @@
|
|||||||
"item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron",
|
"item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron",
|
||||||
"item.refinedstorage.construction_core": "Construction Core",
|
"item.refinedstorage.construction_core": "Construction Core",
|
||||||
"item.refinedstorage.destruction_core": "Destruction Core",
|
"item.refinedstorage.destruction_core": "Destruction Core",
|
||||||
"item.refinedstorage:silicon": "Silicon",
|
"item.refinedstorage.silicon": "Silicon",
|
||||||
"item.refinedstorage:processor.0": "Raw Basic Processor",
|
"item.refinedstorage.raw_basic_processor": "Raw Basic Processor",
|
||||||
"item.refinedstorage:processor.1": "Raw Improved Processor",
|
"item.refinedstorage.raw_improved_processor": "Raw Improved Processor",
|
||||||
"item.refinedstorage:processor.2": "Raw Advanced Processor",
|
"item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor",
|
||||||
"item.refinedstorage:processor.3": "Basic Processor",
|
"item.refinedstorage.basic_processor": "Basic Processor",
|
||||||
"item.refinedstorage:processor.4": "Improved Processor",
|
"item.refinedstorage.improved_processor": "Improved Processor",
|
||||||
"item.refinedstorage:processor.5": "Advanced Processor",
|
"item.refinedstorage.advanced_processor": "Advanced Processor",
|
||||||
"item.refinedstorage:storage_part.0": "1k Storage Part",
|
"item.refinedstorage:storage_part.0": "1k Storage Part",
|
||||||
"item.refinedstorage:storage_part.1": "4k Storage Part",
|
"item.refinedstorage:storage_part.1": "4k Storage Part",
|
||||||
"item.refinedstorage:storage_part.2": "16k Storage Part",
|
"item.refinedstorage:storage_part.2": "16k Storage Part",
|
||||||
|
@@ -1,37 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"name": "basic_processor",
|
|
||||||
"ingredient": {
|
|
||||||
"item": "refinedstorage:processor",
|
|
||||||
"data": 3
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "improved_processor",
|
|
||||||
"ingredient": {
|
|
||||||
"item": "refinedstorage:processor",
|
|
||||||
"data": 4
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "advanced_processor",
|
|
||||||
"ingredient": {
|
|
||||||
"item": "refinedstorage:processor",
|
|
||||||
"data": 5
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "construction_core",
|
|
||||||
"ingredient": {
|
|
||||||
"item": "refinedstorage:core",
|
|
||||||
"data": 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "destruction_core",
|
|
||||||
"ingredient": {
|
|
||||||
"item": "refinedstorage:core",
|
|
||||||
"data": 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:smelting",
|
||||||
|
"ingredient": {
|
||||||
|
"item": "refinedstorage:raw_advanced_processor"
|
||||||
|
},
|
||||||
|
"result": "refinedstorage:advanced_processor",
|
||||||
|
"experience": 0.5
|
||||||
|
}
|
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:smelting",
|
||||||
|
"ingredient": {
|
||||||
|
"item": "refinedstorage:raw_basic_processor"
|
||||||
|
},
|
||||||
|
"result": "refinedstorage:basic_processor",
|
||||||
|
"experience": 0.5
|
||||||
|
}
|
@@ -2,14 +2,13 @@
|
|||||||
"type": "minecraft:crafting_shapeless",
|
"type": "minecraft:crafting_shapeless",
|
||||||
"ingredients": [
|
"ingredients": [
|
||||||
{
|
{
|
||||||
"item": "#basic_processor"
|
"item": "refinedstorage:basic_processor"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:glowstone_dust"
|
"item": "minecraft:glowstone_dust"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "refinedstorage:core",
|
"item": "refinedstorage:construction_core"
|
||||||
"data": 0
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -2,14 +2,13 @@
|
|||||||
"type": "minecraft:crafting_shapeless",
|
"type": "minecraft:crafting_shapeless",
|
||||||
"ingredients": [
|
"ingredients": [
|
||||||
{
|
{
|
||||||
"item": "#basic_processor"
|
"item": "refinedstorage:basic_processor"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:quartz"
|
"item": "minecraft:quartz"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "refinedstorage:core",
|
"item": "refinedstorage:destruction_core"
|
||||||
"data": 1
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:smelting",
|
||||||
|
"ingredient": {
|
||||||
|
"item": "refinedstorage:raw_improved_processor"
|
||||||
|
},
|
||||||
|
"result": "refinedstorage:improved_processor",
|
||||||
|
"experience": 0.5
|
||||||
|
}
|
@@ -10,8 +10,7 @@
|
|||||||
"item": "minecraft:string"
|
"item": "minecraft:string"
|
||||||
},
|
},
|
||||||
"L": {
|
"L": {
|
||||||
"type": "forge:ore_dict",
|
"item": "minecraft:slime_ball"
|
||||||
"ore": "slimeball"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
@@ -8,15 +8,13 @@
|
|||||||
"item": "minecraft:diamond"
|
"item": "minecraft:diamond"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "forge:ore_dict",
|
"item": "refinedstorage:silicon"
|
||||||
"ore": "itemSilicon"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:redstone"
|
"item": "minecraft:redstone"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "refinedstorage:processor",
|
"item": "refinedstorage:raw_advanced_processor"
|
||||||
"data": 2
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -8,15 +8,13 @@
|
|||||||
"item": "minecraft:iron_ingot"
|
"item": "minecraft:iron_ingot"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "forge:ore_dict",
|
"item": "refinedstorage:silicon"
|
||||||
"ore": "itemSilicon"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:redstone"
|
"item": "minecraft:redstone"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "refinedstorage:processor",
|
"item": "refinedstorage:raw_basic_processor"
|
||||||
"data": 0
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -8,15 +8,13 @@
|
|||||||
"item": "minecraft:gold_ingot"
|
"item": "minecraft:gold_ingot"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "forge:ore_dict",
|
"item": "refinedstorage:silicon"
|
||||||
"ore": "itemSilicon"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "minecraft:redstone"
|
"item": "minecraft:redstone"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "refinedstorage:processor",
|
"item": "refinedstorage:raw_improved_processor"
|
||||||
"data": 1
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:smelting",
|
||||||
|
"ingredient": {
|
||||||
|
"item": "minecraft:quartz"
|
||||||
|
},
|
||||||
|
"result": "refinedstorage:silicon",
|
||||||
|
"experience": 0.5
|
||||||
|
}
|
Reference in New Issue
Block a user