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

Change item classnames to new convention

Browse Source
This commit is contained in:
raoulvdberge
2019-09-16 22:08:36 +02:00
parent 21d9c3c653
commit 0cbab85ba2
40 changed files with 187 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -73,46 +73,46 @@ public final class RS {
@SubscribeEvent
public void onRegisterItems(RegistryEvent.Register<Item> e) {
e.getRegistry().register(new ItemCore(ItemCore.Type.CONSTRUCTION));
e.getRegistry().register(new ItemCore(ItemCore.Type.DESTRUCTION));
e.getRegistry().register(new ItemQuartzEnrichedIron());
e.getRegistry().register(new ItemProcessorBinding());
e.getRegistry().register(new CoreItem(CoreItem.Type.CONSTRUCTION));
e.getRegistry().register(new CoreItem(CoreItem.Type.DESTRUCTION));
e.getRegistry().register(new QuartzEnrichedIronItem());
e.getRegistry().register(new ProcessorBindingItem());
for (ItemProcessor.Type type : ItemProcessor.Type.values()) {
e.getRegistry().register(new ItemProcessor(type));
for (ProcessorItem.Type type : ProcessorItem.Type.values()) {
e.getRegistry().register(new ProcessorItem(type));
}
e.getRegistry().register(new ItemSilicon());
e.getRegistry().register(new SiliconItem());
e.getRegistry().register(new ItemSecurityCard());
e.getRegistry().register(new ItemNetworkCard());
e.getRegistry().register(new ItemCuttingTool());
e.getRegistry().register(new SecurityCardItem());
e.getRegistry().register(new NetworkCardItem());
e.getRegistry().register(new CuttingToolItem());
for (ItemStorageType type : ItemStorageType.values()) {
if (type != ItemStorageType.CREATIVE) {
e.getRegistry().register(new ItemStoragePart(type));
e.getRegistry().register(new StoragePartItem(type));
}
e.getRegistry().register(new ItemStorageDisk(type));
e.getRegistry().register(new StorageDiskItem(type));
}
for (FluidStorageType type : FluidStorageType.values()) {
if (type != FluidStorageType.CREATIVE) {
e.getRegistry().register(new ItemFluidStoragePart(type));
e.getRegistry().register(new FluidStoragePartItem(type));
}
e.getRegistry().register(new ItemFluidStorageDisk(type));
e.getRegistry().register(new FluidStorageDiskItem(type));
}
e.getRegistry().register(new ItemStorageHousing());
e.getRegistry().register(new StorageHousingItem());
for (ItemUpgrade.Type type : ItemUpgrade.Type.values()) {
e.getRegistry().register(new ItemUpgrade(type));
for (UpgradeItem.Type type : UpgradeItem.Type.values()) {
e.getRegistry().register(new UpgradeItem(type));
}
e.getRegistry().register(new ItemWrench());
e.getRegistry().register(new ItemPattern());
e.getRegistry().register(new ItemFilter());
e.getRegistry().register(new WrenchItem());
e.getRegistry().register(new PatternItem());
e.getRegistry().register(new FilterItem());
}
/* TODO

90
src/main/java/com/raoulvdberge/refinedstorage/RSItems.java
View File

@@ -11,101 +11,101 @@ public final class RSItems {
public static final ItemHollowCover HOLLOW_COVER = null;
@ObjectHolder(RS.ID + ":quartz_enriched_iron")
public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = null;
public static final QuartzEnrichedIronItem QUARTZ_ENRICHED_IRON = null;
@ObjectHolder(RS.ID + ":silicon")
public static final ItemSilicon SILICON = null;
public static final SiliconItem SILICON = null;
@ObjectHolder(RS.ID + ":processor_binding")
public static final ItemProcessorBinding PROCESSOR_BINDING = null;
public static final ProcessorBindingItem PROCESSOR_BINDING = null;
@ObjectHolder(RS.ID + ":wrench")
public static final ItemWrench WRENCH = null;
public static final WrenchItem WRENCH = null;
@ObjectHolder(RS.ID + ":pattern")
public static final ItemPattern PATTERN = null;
public static final PatternItem PATTERN = null;
@ObjectHolder(RS.ID + ":filter")
public static final ItemFilter FILTER = null;
public static final FilterItem FILTER = null;
@ObjectHolder(RS.ID + ":storage_housing")
public static final ItemStorageHousing STORAGE_HOUSING = null;
public static final StorageHousingItem STORAGE_HOUSING = null;
@ObjectHolder(RS.ID + ":cutting_tool")
public static final ItemCuttingTool CUTTING_TOOL = null;
public static final CuttingToolItem CUTTING_TOOL = null;
@ObjectHolder(RS.ID + ":network_card")
public static final ItemNetworkCard NETWORK_CARD = null;
public static final NetworkCardItem NETWORK_CARD = null;
@ObjectHolder(RS.ID + ":security_card")
public static final ItemSecurityCard SECURITY_CARD = null;
public static final SecurityCardItem SECURITY_CARD = null;
@ObjectHolder(RS.ID + ":construction_core")
public static final ItemCore CONSTRUCTION_CORE = null;
public static final CoreItem CONSTRUCTION_CORE = null;
@ObjectHolder(RS.ID + ":destruction_core")
public static final ItemCore DESTRUCTION_CORE = null;
public static final CoreItem DESTRUCTION_CORE = null;
@ObjectHolder(RS.ID + ":raw_basic_processor")
public static final ItemProcessor RAW_BASIC_PROCESSOR = null;
public static final ProcessorItem RAW_BASIC_PROCESSOR = null;
@ObjectHolder(RS.ID + ":raw_improved_processor")
public static final ItemProcessor RAW_IMPROVED_PROCESSOR = null;
public static final ProcessorItem RAW_IMPROVED_PROCESSOR = null;
@ObjectHolder(RS.ID + ":raw_advanced_processor")
public static final ItemProcessor RAW_ADVANCED_PROCESSOR = null;
public static final ProcessorItem RAW_ADVANCED_PROCESSOR = null;
@ObjectHolder(RS.ID + ":basic_processor")
public static final ItemProcessor BASIC_PROCESSOR = null;
public static final ProcessorItem BASIC_PROCESSOR = null;
@ObjectHolder(RS.ID + ":improved_processor")
public static final ItemProcessor IMPROVED_PROCESSOR = null;
public static final ProcessorItem IMPROVED_PROCESSOR = null;
@ObjectHolder(RS.ID + ":advanced_processor")
public static final ItemProcessor ADVANCED_PROCESSOR = null;
public static final ProcessorItem ADVANCED_PROCESSOR = null;
@ObjectHolder(RS.ID + ":upgrade")
public static final ItemUpgrade UPGRADE = null;
public static final UpgradeItem UPGRADE = null;
@ObjectHolder(RS.ID + ":speed_upgrade")
public static final ItemUpgrade SPEED_UPGRADE = null;
public static final UpgradeItem SPEED_UPGRADE = null;
@ObjectHolder(RS.ID + ":range_upgrade")
public static final ItemUpgrade RANGE_UPGRADE = null;
public static final UpgradeItem RANGE_UPGRADE = null;
@ObjectHolder(RS.ID + ":crafting_upgrade")
public static final ItemUpgrade CRAFTING_UPGRADE = null;
public static final UpgradeItem CRAFTING_UPGRADE = null;
@ObjectHolder(RS.ID + ":stack_upgrade")
public static final ItemUpgrade STACK_UPGRADE = null;
public static final UpgradeItem STACK_UPGRADE = null;
@ObjectHolder(RS.ID + ":silk_touch_upgrade")
public static final ItemUpgrade SILK_TOUCH_UPGRADE = null;
public static final UpgradeItem SILK_TOUCH_UPGRADE = null;
@ObjectHolder(RS.ID + ":fortune_1_upgrade")
public static final ItemUpgrade FORTUNE_1_UPGRADE = null;
public static final UpgradeItem FORTUNE_1_UPGRADE = null;
@ObjectHolder(RS.ID + ":fortune_2_upgrade")
public static final ItemUpgrade FORTUNE_2_UPGRADE = null;
public static final UpgradeItem FORTUNE_2_UPGRADE = null;
@ObjectHolder(RS.ID + ":fortune_3_upgrade")
public static final ItemUpgrade FORTUNE_3_UPGRADE = null;
public static final UpgradeItem FORTUNE_3_UPGRADE = null;
@ObjectHolder(RS.ID + ":1k_storage_part")
public static final ItemStoragePart ONE_K_STORAGE_PART = null;
public static final StoragePartItem ONE_K_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":4k_storage_part")
public static final ItemStoragePart FOUR_K_STORAGE_PART = null;
public static final StoragePartItem FOUR_K_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":16k_storage_part")
public static final ItemStoragePart SIXTEEN_K_STORAGE_PART = null;
public static final StoragePartItem SIXTEEN_K_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":64k_storage_part")
public static final ItemStoragePart SIXTY_FOUR_K_STORAGE_PART = null;
public static final StoragePartItem SIXTY_FOUR_K_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":1k_storage_disk")
public static final ItemStorageDisk ONE_K_STORAGE_DISK = null;
public static final StorageDiskItem ONE_K_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":4k_storage_disk")
public static final ItemStorageDisk FOUR_K_STORAGE_DISK = null;
public static final StorageDiskItem FOUR_K_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":16k_storage_disk")
public static final ItemStorageDisk SIXTEEN_K_STORAGE_DISK = null;
public static final StorageDiskItem SIXTEEN_K_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":64k_storage_disk")
public static final ItemStorageDisk SIXTY_FOUR_K_STORAGE_DISK = null;
public static final StorageDiskItem SIXTY_FOUR_K_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":creative_storage_disk")
public static final ItemStorageDisk CREATIVE_STORAGE_DISK = null;
public static final StorageDiskItem CREATIVE_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":64k_fluid_storage_part")
public static final ItemFluidStoragePart SIXTY_FOUR_K_FLUID_STORAGE_PART = null;
public static final FluidStoragePartItem SIXTY_FOUR_K_FLUID_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":256k_fluid_storage_part")
public static final ItemFluidStoragePart TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_PART = null;
public static final FluidStoragePartItem TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":1024k_fluid_storage_part")
public static final ItemFluidStoragePart THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_PART = null;
public static final FluidStoragePartItem THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":4096k_fluid_storage_part")
public static final ItemFluidStoragePart FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_PART = null;
public static final FluidStoragePartItem FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_PART = null;
@ObjectHolder(RS.ID + ":64k_fluid_storage_disk")
public static final ItemFluidStorageDisk SIXTY_FOUR_K_FLUID_STORAGE_DISK = null;
public static final FluidStorageDiskItem SIXTY_FOUR_K_FLUID_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":256k_fluid_storage_disk")
public static final ItemFluidStorageDisk TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_DISK = null;
public static final FluidStorageDiskItem TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":1024k_fluid_storage_disk")
public static final ItemFluidStorageDisk THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_DISK = null;
public static final FluidStorageDiskItem THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":4096k_fluid_storage_disk")
public static final ItemFluidStorageDisk FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_DISK = null;
public static final FluidStorageDiskItem FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_DISK = null;
@ObjectHolder(RS.ID + ":creative_fluid_storage_disk")
public static final ItemFluidStorageDisk CREATIVE_FLUID_STORAGE_DISK = null;
public static final FluidStorageDiskItem CREATIVE_FLUID_STORAGE_DISK = null;
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java
View File

@@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.tile.TileConstructor;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -238,7 +238,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
}*/
}
}
} else if (upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
} else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
ItemStack craft = itemFilters.getStackInSlot(0);
network.getCraftingManager().request(this, craft, 1);
@@ -250,7 +250,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
if (took != null) {
DefaultDispenseItemBehavior.doDispense(world, took, 6, getDirection(), new Position(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ()));
} else if (upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
} else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
ItemStack craft = itemFilters.getStackInSlot(0);
network.getCraftingManager().request(this, craft, 1);

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java
View File

@@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import com.raoulvdberge.refinedstorage.util.WorldUtils;
import net.minecraft.item.ItemStack;
@@ -236,7 +236,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
@Override
public int getUpdateInterval() {
switch (upgrades.getUpgradeCount(ItemUpgrade.Type.SPEED)) {
switch (upgrades.getUpgradeCount(UpgradeItem.Type.SPEED)) {
case 0:
return 10;
case 1:
@@ -254,7 +254,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
@Override
public int getMaximumSuccessfulCraftingUpdates() {
switch (upgrades.getUpgradeCount(ItemUpgrade.Type.SPEED)) {
switch (upgrades.getUpgradeCount(UpgradeItem.Type.SPEED)) {
case 0:
return 1;
case 1:

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
View File

@@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.tile.TileExporter;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
@@ -88,7 +88,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
ItemStack took = network.extractItem(slot, Math.min(slot.getMaxStackSize(), stackSize), compare, Action.SIMULATE);
if (took == null) {
if (upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
network.getCraftingManager().request(new SlottedCraftingRequest(this, filterSlot), slot, stackSize);
}
} else if (ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
@@ -141,7 +141,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
handler.fill(took, IFluidHandler.FluidAction.EXECUTE);
}
}
} else if (upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
} else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
network.getCraftingManager().request(this, stack, toExtract);
}
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
View File

@@ -11,7 +11,7 @@ import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.tile.TileFluidInterface;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.util.StackUtils;
@@ -138,7 +138,7 @@ public class NetworkNodeFluidInterface extends NetworkNode {
// That means we still have to autocraft 2 fluids.
delta -= result == null ? 0 : result.getAmount();
if (delta > 0 && upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
if (delta > 0 && upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
network.getCraftingManager().request(this, wanted, delta);
}
} else if (delta < 0) {

18
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java
View File

@@ -22,7 +22,7 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemPattern;
import com.raoulvdberge.refinedstorage.item.PatternItem;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
@@ -548,26 +548,26 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
ItemStack pattern = new ItemStack(RSItems.PATTERN);
ItemPattern.setToCurrentVersion(pattern);
ItemPattern.setOredict(pattern, oredictPattern);
ItemPattern.setProcessing(pattern, processingPattern);
PatternItem.setToCurrentVersion(pattern);
PatternItem.setOredict(pattern, oredictPattern);
PatternItem.setProcessing(pattern, processingPattern);
if (processingPattern) {
for (int i = 0; i < 18; ++i) {
if (!processingMatrix.getStackInSlot(i).isEmpty()) {
if (i >= 9) {
ItemPattern.setOutputSlot(pattern, i - 9, processingMatrix.getStackInSlot(i));
PatternItem.setOutputSlot(pattern, i - 9, processingMatrix.getStackInSlot(i));
} else {
ItemPattern.setInputSlot(pattern, i, processingMatrix.getStackInSlot(i));
PatternItem.setInputSlot(pattern, i, processingMatrix.getStackInSlot(i));
}
}
FluidStack fluid = processingMatrixFluids.getFluid(i);
if (!fluid.isEmpty()) {
if (i >= 9) {
ItemPattern.setFluidOutputSlot(pattern, i - 9, fluid);
PatternItem.setFluidOutputSlot(pattern, i - 9, fluid);
} else {
ItemPattern.setFluidInputSlot(pattern, i, fluid);
PatternItem.setFluidInputSlot(pattern, i, fluid);
}
}
}
@@ -576,7 +576,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
ItemStack ingredient = matrix.getStackInSlot(i);
if (!ingredient.isEmpty()) {
ItemPattern.setInputSlot(pattern, i, ingredient);
PatternItem.setInputSlot(pattern, i, ingredient);
}
}
}

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java
View File

@@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerProxy;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.util.StackUtils;
@@ -118,7 +118,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable {
// That means we still have to autocraft 2 items.
delta -= result == null ? 0 : result.getCount();
if (delta > 0 && upgrades.hasUpgrade(ItemUpgrade.Type.CRAFTING)) {
if (delta > 0 && upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
network.getCraftingManager().request(new SlottedCraftingRequest(this, i), wanted, delta);
}
} else if (delta < 0) {

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java
View File

@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
@@ -52,7 +52,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
@Override
public int getRange() {
return RS.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.Type.RANGE) * RS.INSTANCE.config.wirelessTransmitterRangePerUpgrade);
return RS.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(UpgradeItem.Type.RANGE) * RS.INSTANCE.config.wirelessTransmitterRangePerUpgrade);
}
@Override

12
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java
View File

@@ -8,7 +8,7 @@ import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilterIcon;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterIcon;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -28,8 +28,8 @@ public class ContainerFilter extends ContainerBase {
FluidInventory fluidFilter = new FluidInventoryFilter(stack);
for (int i = 0; i < 27; ++i) {
addSlot(new SlotFilter(filter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
addSlot(new SlotFilterFluid(fluidFilter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
addSlot(new SlotFilter(filter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS));
addSlot(new SlotFilterFluid(fluidFilter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS));
if ((i + 1) % 9 == 0) {
x = 8;
@@ -39,12 +39,12 @@ public class ContainerFilter extends ContainerBase {
}
}
addSlot(new SlotFilter(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
addSlot(new SlotFilterFluid(new FluidInventoryFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
addSlot(new SlotFilter(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS));
addSlot(new SlotFilterFluid(new FluidInventoryFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS));
addPlayerInventory(8, 149);
transferManager.addFilterTransfer(player.inventory, filter, fluidFilter, () -> ItemFilter.getType(stack));
transferManager.addFilterTransfer(player.inventory, filter, fluidFilter, () -> FilterItem.getType(stack));
}
public ItemStack getStack() {

14
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFilter.java
View File

@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.container.ContainerFilter;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonFilterType;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import com.raoulvdberge.refinedstorage.network.MessageFilterUpdate;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.gui.widget.button.Button;
@@ -33,11 +33,11 @@ public class GuiFilter extends GuiBase<ContainerFilter> {
this.stack = container.getStack();
this.compare = ItemFilter.getCompare(container.getStack());
this.mode = ItemFilter.getMode(container.getStack());
this.modFilter = ItemFilter.isModFilter(container.getStack());
this.name = ItemFilter.getName(container.getStack());
this.type = ItemFilter.getType(container.getStack());
this.compare = FilterItem.getCompare(container.getStack());
this.mode = FilterItem.getMode(container.getStack());
this.modFilter = FilterItem.isModFilter(container.getStack());
this.name = FilterItem.getName(container.getStack());
this.type = FilterItem.getType(container.getStack());
}
@Override
@@ -110,7 +110,7 @@ public class GuiFilter extends GuiBase<ContainerFilter> {
public void setType(int type) {
this.type = type;
ItemFilter.setType(stack, type);
FilterItem.setType(stack, type);
}
public void sendUpdate() {

8
src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilter.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.inventory.fluid;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.NonNullList;
@@ -15,11 +15,11 @@ public class FluidInventoryFilter extends FluidInventory {
stack.setTag(new CompoundNBT());
}
stack.getTag().put(ItemFilter.NBT_FLUID_FILTERS, writeToNbt());
stack.getTag().put(FilterItem.NBT_FLUID_FILTERS, writeToNbt());
};
if (stack.hasTag() && stack.getTag().contains(ItemFilter.NBT_FLUID_FILTERS)) {
readFromNbt(stack.getTag().getCompound(ItemFilter.NBT_FLUID_FILTERS));
if (stack.hasTag() && stack.getTag().contains(FilterItem.NBT_FLUID_FILTERS)) {
readFromNbt(stack.getTag().getCompound(FilterItem.NBT_FLUID_FILTERS));
}
}

6
src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.inventory.fluid;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.fluids.FluidStack;
@@ -14,10 +14,10 @@ public class FluidInventoryFilterIcon extends FluidInventory {
stack.setTag(new CompoundNBT());
}
ItemFilter.setFluidIcon(stack, getFluid(slot));
FilterItem.setFluidIcon(stack, getFluid(slot));
};
FluidStack icon = ItemFilter.getFluidIcon(stack);
FluidStack icon = FilterItem.getFluidIcon(stack);
if (icon != null) {
setFluid(0, icon);
}

17
src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java
View File

@@ -5,12 +5,11 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridTab;
import com.raoulvdberge.refinedstorage.apiimpl.util.FilterFluid;
import com.raoulvdberge.refinedstorage.apiimpl.util.FilterItem;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.LogicalSide;
@@ -53,9 +52,9 @@ public class ItemHandlerFilter extends ItemHandlerBase {
}
private void addFilter(ItemStack filter) {
int compare = ItemFilter.getCompare(filter);
int mode = ItemFilter.getMode(filter);
boolean modFilter = ItemFilter.isModFilter(filter);
int compare = FilterItem.getCompare(filter);
int mode = FilterItem.getMode(filter);
boolean modFilter = FilterItem.isModFilter(filter);
List<IFilter> filters = new ArrayList<>();
@@ -65,7 +64,7 @@ public class ItemHandlerFilter extends ItemHandlerBase {
if (stack.getItem() == RSItems.FILTER) {
addFilter(stack);
} else if (!stack.isEmpty()) {
filters.add(new FilterItem(stack, compare, mode, modFilter));
filters.add(new com.raoulvdberge.refinedstorage.apiimpl.util.FilterItem(stack, compare, mode, modFilter));
}
}
@@ -75,13 +74,13 @@ public class ItemHandlerFilter extends ItemHandlerBase {
filters.add(new FilterFluid(stack, compare, mode, modFilter));
}
ItemStack icon = ItemFilter.getIcon(filter);
FluidStack fluidIcon = ItemFilter.getFluidIcon(filter);
ItemStack icon = FilterItem.getIcon(filter);
FluidStack fluidIcon = FilterItem.getFluidIcon(filter);
if (icon.isEmpty() && fluidIcon == null) {
this.filters.addAll(filters);
} else {
tabs.add(new GridTab(filters, ItemFilter.getName(filter), icon, fluidIcon));
tabs.add(new GridTab(filters, FilterItem.getName(filter), icon, fluidIcon));
}
}
}

6
src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterIcon.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.inventory.item;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler;
@@ -12,13 +12,13 @@ public class ItemHandlerFilterIcon extends ItemStackHandler {
this.stack = stack;
setStackInSlot(0, ItemFilter.getIcon(stack));
setStackInSlot(0, FilterItem.getIcon(stack));
}
@Override
protected void onContentsChanged(int slot) {
super.onContentsChanged(slot);
ItemFilter.setIcon(stack, getStackInSlot(0));
FilterItem.setIcon(stack, getStackInSlot(0));
}
}

24
src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerUpgrade.java
View File

@@ -2,14 +2,14 @@ package com.raoulvdberge.refinedstorage.inventory.item;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
import java.util.function.Consumer;
public class ItemHandlerUpgrade extends ItemHandlerBase {
public ItemHandlerUpgrade(int size, @Nullable Consumer<Integer> listener, ItemUpgrade.Type... supportedUpgrades) {
public ItemHandlerUpgrade(int size, @Nullable Consumer<Integer> listener, UpgradeItem.Type... supportedUpgrades) {
super(size, listener, new ItemValidatorBasic[supportedUpgrades.length]);
for (int i = 0; i < supportedUpgrades.length; ++i) {
@@ -25,7 +25,7 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
for (int i = 0; i < getSlots(); ++i) {
ItemStack slot = getStackInSlot(i);
if (slot.getItem() instanceof ItemUpgrade && ((ItemUpgrade) slot.getItem()).getType() == ItemUpgrade.Type.SPEED) {
if (slot.getItem() instanceof UpgradeItem && ((UpgradeItem) slot.getItem()).getType() == UpgradeItem.Type.SPEED) {
speed -= speedIncrease;
}
}
@@ -33,11 +33,11 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
return speed;
}
public boolean hasUpgrade(ItemUpgrade.Type type) {
public boolean hasUpgrade(UpgradeItem.Type type) {
for (int i = 0; i < getSlots(); ++i) {
ItemStack slot = getStackInSlot(i);
if (slot.getItem() instanceof ItemUpgrade && ((ItemUpgrade) slot.getItem()).getType() == type) {
if (slot.getItem() instanceof UpgradeItem && ((UpgradeItem) slot.getItem()).getType() == type) {
return true;
}
}
@@ -45,13 +45,13 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
return false;
}
public int getUpgradeCount(ItemUpgrade.Type type) {
public int getUpgradeCount(UpgradeItem.Type type) {
int upgrades = 0;
for (int i = 0; i < getSlots(); ++i) {
ItemStack slot = getStackInSlot(i);
if (slot.getItem() instanceof ItemUpgrade && ((ItemUpgrade) slot.getItem()).getType() == type) {
if (slot.getItem() instanceof UpgradeItem && ((UpgradeItem) slot.getItem()).getType() == type) {
upgrades++;
}
}
@@ -65,8 +65,8 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
for (int i = 0; i < getSlots(); ++i) {
ItemStack slot = getStackInSlot(i);
if (slot.getItem() instanceof ItemUpgrade) {
usage += ((ItemUpgrade) slot.getItem()).getType().getEnergyUsage();
if (slot.getItem() instanceof UpgradeItem) {
usage += ((UpgradeItem) slot.getItem()).getType().getEnergyUsage();
}
}
@@ -79,8 +79,8 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
for (int i = 0; i < getSlots(); ++i) {
ItemStack slot = getStackInSlot(i);
if (slot.getItem() instanceof ItemUpgrade) {
int fortune = ((ItemUpgrade) slot.getItem()).getType().getFortuneLevel();
if (slot.getItem() instanceof UpgradeItem) {
int fortune = ((UpgradeItem) slot.getItem()).getType().getFortuneLevel();
if (fortune > maxFortune) {
maxFortune = fortune;
@@ -92,7 +92,7 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
}
public int getItemInteractCount() {
return hasUpgrade(ItemUpgrade.Type.STACK) ? 64 : 1;
return hasUpgrade(UpgradeItem.Type.STACK) ? 64 : 1;
}
@Override

8
src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/ItemValidatorUpgrade.java
View File

@@ -1,19 +1,19 @@
package com.raoulvdberge.refinedstorage.inventory.item.validator;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.item.UpgradeItem;
import net.minecraft.item.ItemStack;
import java.util.function.Predicate;
public class ItemValidatorUpgrade implements Predicate<ItemStack> {
private ItemUpgrade.Type type;
private UpgradeItem.Type type;
public ItemValidatorUpgrade(ItemUpgrade.Type type) {
public ItemValidatorUpgrade(UpgradeItem.Type type) {
this.type = type;
}
@Override
public boolean test(ItemStack stack) {
return stack.getItem() instanceof ItemUpgrade && ((ItemUpgrade) stack.getItem()).getType() == type;
return stack.getItem() instanceof UpgradeItem && ((UpgradeItem) stack.getItem()).getType() == type;
}
}

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java → src/main/java/com/raoulvdberge/refinedstorage/item/CoreItem.java Executable file → Normal file
View File

@@ -3,13 +3,13 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemCore extends Item {
public class CoreItem extends Item {
public enum Type {
CONSTRUCTION,
DESTRUCTION
}
public ItemCore(Type type) {
public CoreItem(Type type) {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, type == Type.CONSTRUCTION ? "construction_core" : "destruction_core");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java → src/main/java/com/raoulvdberge/refinedstorage/item/CuttingToolItem.java
View File

@@ -4,8 +4,8 @@ import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemCuttingTool extends Item {
public ItemCuttingTool() {
public class CuttingToolItem extends Item {
public CuttingToolItem() {
super(new Item.Properties().group(RS.MAIN_GROUP).maxDamage(50 - 1));
this.setRegistryName(RS.ID, "cutting_tool");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWithEnergy.java → src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java
View File

@@ -18,11 +18,11 @@ import net.minecraftforge.energy.IEnergyStorage;
import javax.annotation.Nullable;
import java.util.List;
public abstract class ItemWithEnergy extends Item {
public abstract class EnergyItem extends Item {
private final int energyCapacity;
private final boolean creative;
public ItemWithEnergy(Item.Properties properties, boolean creative, int energyCapacity) {
public EnergyItem(Item.Properties properties, boolean creative, int energyCapacity) {
super(properties.maxDamage(energyCapacity).maxStackSize(1));
this.creative = creative;

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java → src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java
View File

@@ -31,7 +31,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public class ItemFilter extends Item {
public class FilterItem extends Item {
private static final String NBT_COMPARE = "Compare";
private static final String NBT_MODE = "Mode";
private static final String NBT_MOD_FILTER = "ModFilter";
@@ -41,7 +41,7 @@ public class ItemFilter extends Item {
private static final String NBT_TYPE = "Type";
public static final String NBT_FLUID_FILTERS = "FluidFilters";
public ItemFilter() {
public FilterItem() {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.setRegistryName(RS.ID, "filter");

6
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java → src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java Executable file → Normal file
View File

@@ -26,12 +26,12 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.UUID;
public class ItemFluidStorageDisk extends Item implements IStorageDiskProvider {
public class FluidStorageDiskItem extends Item implements IStorageDiskProvider {
private static final String NBT_ID = "Id";
private final FluidStorageType type;
public ItemFluidStorageDisk(FluidStorageType type) {
public FluidStorageDiskItem(FluidStorageType type) {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.type = type;
@@ -85,7 +85,7 @@ public class ItemFluidStorageDisk extends Item implements IStorageDiskProvider {
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack);
if (disk != null && disk.getStored() == 0) {
ItemStack storagePart = new ItemStack(ItemFluidStoragePart.getByType(type), diskStack.getCount());
ItemStack storagePart = new ItemStack(FluidStoragePartItem.getByType(type), diskStack.getCount());
if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);

6
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java → src/main/java/com/raoulvdberge/refinedstorage/item/FluidStoragePartItem.java Executable file → Normal file
View File

@@ -5,14 +5,14 @@ import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType;
import net.minecraft.item.Item;
public class ItemFluidStoragePart extends Item {
public ItemFluidStoragePart(FluidStorageType type) {
public class FluidStoragePartItem extends Item {
public FluidStoragePartItem(FluidStorageType type) {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, type.getName() + "_fluid_storage_part");
}
public static ItemFluidStoragePart getByType(FluidStorageType type) {
public static FluidStoragePartItem getByType(FluidStorageType type) {
switch (type) {
case SIXTY_FOUR_K:
return RSItems.SIXTY_FOUR_K_FLUID_STORAGE_PART;

2
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
public class ItemWirelessCraftingMonitor extends ItemWithNetwork {
public class ItemWirelessCraftingMonitor extends NetworkItem {
public static final String NBT_TAB_SELECTED = "TabSelected";
public static final String NBT_TAB_PAGE = "TabPage";

2
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
public class ItemWirelessFluidGrid extends ItemWithNetwork {
public class ItemWirelessFluidGrid extends NetworkItem {
public ItemWirelessFluidGrid(Properties item, boolean creative, int energyCapacity) {
super(item, creative, energyCapacity);
}

2
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
public class ItemWirelessGrid extends ItemWithNetwork {
public class ItemWirelessGrid extends NetworkItem {
public ItemWirelessGrid(Properties item, boolean creative, int energyCapacity) {
super(item, creative, energyCapacity);
}

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java → src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java Executable file → Normal file
View File

@@ -21,13 +21,13 @@ import net.minecraft.world.dimension.DimensionType;
import javax.annotation.Nullable;
import java.util.List;
public class ItemNetworkCard extends Item {
public class NetworkCardItem extends Item {
private static final String NBT_RECEIVER_X = "ReceiverX";
private static final String NBT_RECEIVER_Y = "ReceiverY";
private static final String NBT_RECEIVER_Z = "ReceiverZ";
private static final String NBT_DIMENSION = "Dimension";
public ItemNetworkCard() {
public NetworkCardItem() {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.setRegistryName(RS.ID, "network_card");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWithNetwork.java → src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java
View File

@@ -29,13 +29,13 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.function.Consumer;
public abstract class ItemWithNetwork extends ItemWithEnergy implements INetworkItemProvider {
public abstract class NetworkItem extends EnergyItem implements INetworkItemProvider {
private static final String NBT_CONTROLLER_X = "ControllerX";
private static final String NBT_CONTROLLER_Y = "ControllerY";
private static final String NBT_CONTROLLER_Z = "ControllerZ";
private static final String NBT_DIMENSION = "Dimension";
public ItemWithNetwork(Item.Properties item, boolean creative, int energyCapacity) {
public NetworkItem(Item.Properties item, boolean creative, int energyCapacity) {
super(item, creative, energyCapacity);
addPropertyOverride(new ResourceLocation("connected"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f);

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java → src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java Executable file → Normal file
View File

@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class ItemPattern extends Item implements ICraftingPatternProvider {
public class PatternItem extends Item implements ICraftingPatternProvider {
private static Map<ItemStack, CraftingPattern> CACHE = new HashMap<>();
private static final String NBT_VERSION = "Version";
@@ -43,7 +43,7 @@ public class ItemPattern extends Item implements ICraftingPatternProvider {
private static final int VERSION = 1;
public ItemPattern() {
public PatternItem() {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, "pattern");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java → src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorBindingItem.java
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemProcessorBinding extends Item {
public ItemProcessorBinding() {
public class ProcessorBindingItem extends Item {
public ProcessorBindingItem() {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, "processor_binding");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java → src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorItem.java Executable file → Normal file
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemProcessor extends Item {
public class ProcessorItem extends Item {
public enum Type {
RAW_BASIC("raw_basic"),
@@ -20,7 +20,7 @@ public class ItemProcessor extends Item {
}
}
public ItemProcessor(Type type) {
public ProcessorItem(Type type) {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, type.name + "_processor");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java → src/main/java/com/raoulvdberge/refinedstorage/item/QuartzEnrichedIronItem.java Executable file → Normal file
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemQuartzEnrichedIron extends Item {
public ItemQuartzEnrichedIron() {
public class QuartzEnrichedIronItem extends Item {
public QuartzEnrichedIronItem() {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, "quartz_enriched_iron");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java → src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java Executable file → Normal file
View File

@@ -18,12 +18,12 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.UUID;
public class ItemSecurityCard extends Item {
public class SecurityCardItem extends Item {
private static final String NBT_OWNER = "Owner";
private static final String NBT_OWNER_NAME = "OwnerName";
private static final String NBT_PERMISSION = "Permission_%d";
public ItemSecurityCard() {
public SecurityCardItem() {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.setRegistryName(RS.ID, "security_card");

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemSilicon.java → src/main/java/com/raoulvdberge/refinedstorage/item/SiliconItem.java Executable file → Normal file
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemSilicon extends Item {
public ItemSilicon() {
public class SiliconItem extends Item {
public SiliconItem() {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, "silicon");

6
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java → src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java Executable file → Normal file
View File

@@ -26,12 +26,12 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.UUID;
public class ItemStorageDisk extends Item implements IStorageDiskProvider {
public class StorageDiskItem extends Item implements IStorageDiskProvider {
private static final String NBT_ID = "Id";
private final ItemStorageType type;
public ItemStorageDisk(ItemStorageType type) {
public StorageDiskItem(ItemStorageType type) {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.type = type;
@@ -85,7 +85,7 @@ public class ItemStorageDisk extends Item implements IStorageDiskProvider {
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack);
if (disk != null && disk.getStored() == 0) {
ItemStack storagePart = new ItemStack(ItemStoragePart.getByType(type), diskStack.getCount());
ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type), diskStack.getCount());
if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java → src/main/java/com/raoulvdberge/refinedstorage/item/StorageHousingItem.java Executable file → Normal file
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.item.Item;
public class ItemStorageHousing extends Item {
public ItemStorageHousing() {
public class StorageHousingItem extends Item {
public StorageHousingItem() {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, "storage_housing");

6
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java → src/main/java/com/raoulvdberge/refinedstorage/item/StoragePartItem.java Executable file → Normal file
View File

@@ -5,14 +5,14 @@ import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType;
import net.minecraft.item.Item;
public class ItemStoragePart extends Item {
public ItemStoragePart(ItemStorageType type) {
public class StoragePartItem extends Item {
public StoragePartItem(ItemStorageType type) {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.setRegistryName(RS.ID, type.getName() + "_storage_part");
}
public static ItemStoragePart getByType(ItemStorageType type) {
public static StoragePartItem getByType(ItemStorageType type) {
switch (type) {
case ONE_K:
return RSItems.ONE_K_STORAGE_PART;

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java → src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java Executable file → Normal file
View File

@@ -13,7 +13,7 @@ import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class ItemUpgrade extends Item {
public class UpgradeItem extends Item {
public enum Type {
NORMAL("normal"),
SPEED("speed"),
@@ -76,7 +76,7 @@ public class ItemUpgrade extends Item {
private final Type type;
public ItemUpgrade(Type type) {
public UpgradeItem(Type type) {
super(new Item.Properties().group(RS.MAIN_GROUP));
this.type = type;

4
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java → src/main/java/com/raoulvdberge/refinedstorage/item/WrenchItem.java
View File

@@ -11,8 +11,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Rotation;
public class ItemWrench extends Item {
public ItemWrench() {
public class WrenchItem extends Item {
public WrenchItem() {
super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1));
this.setRegistryName(RS.ID, "wrench");

12
src/main/java/com/raoulvdberge/refinedstorage/network/MessageFilterUpdate.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.container.ContainerFilter;
import com.raoulvdberge.refinedstorage.item.ItemFilter;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent;
@@ -46,11 +46,11 @@ public class MessageFilterUpdate {
PlayerEntity player = ctx.get().getSender();
if (player != null && player.openContainer instanceof ContainerFilter) {
ItemFilter.setCompare(((ContainerFilter) player.openContainer).getStack(), message.compare);
ItemFilter.setMode(((ContainerFilter) player.openContainer).getStack(), message.mode);
ItemFilter.setModFilter(((ContainerFilter) player.openContainer).getStack(), message.modFilter);
ItemFilter.setName(((ContainerFilter) player.openContainer).getStack(), message.name);
ItemFilter.setType(((ContainerFilter) player.openContainer).getStack(), message.type);
FilterItem.setCompare(((ContainerFilter) player.openContainer).getStack(), message.compare);
FilterItem.setMode(((ContainerFilter) player.openContainer).getStack(), message.mode);
FilterItem.setModFilter(((ContainerFilter) player.openContainer).getStack(), message.modFilter);
FilterItem.setName(((ContainerFilter) player.openContainer).getStack(), message.name);
FilterItem.setType(((ContainerFilter) player.openContainer).getStack(), message.type);
}
});
ctx.get().setPacketHandled(true);