Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed redundant suffixes.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-19 11:38:49 +01:00
parent 21e742435a
commit 9001104074
24 changed files with 81 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java
View File

@@ -13,9 +13,9 @@ public final class CustomItemModelProperties {
///////////////////////////////////////////////////////////////////
public static void initialize() {
ItemModelsProperties.registerProperty(Items.MEMORY_ITEM.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
ItemModelsProperties.registerProperty(Items.MEMORY.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
(stack, world, entity) -> AbstractStorageItem.getCapacity(stack));
ItemModelsProperties.registerProperty(Items.HARD_DRIVE_ITEM.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
ItemModelsProperties.registerProperty(Items.HARD_DRIVE.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
(stack, world, entity) -> HardDriveItem.getBaseBlockDevice(stack) != null ? Integer.MAX_VALUE : AbstractStorageItem.getCapacity(stack));
}
}

10
src/main/java/li/cil/oc2/common/block/Blocks.java
View File

@@ -13,11 +13,11 @@ public final class Blocks {
///////////////////////////////////////////////////////////////////
public static final RegistryObject<ComputerBlock> COMPUTER_BLOCK = BLOCKS.register(Constants.COMPUTER_BLOCK_NAME, ComputerBlock::new);
public static final RegistryObject<BusCableBlock> BUS_CABLE_BLOCK = BLOCKS.register(Constants.BUS_CABLE_BLOCK_NAME, BusCableBlock::new);
public static final RegistryObject<NetworkConnectorBlock> NETWORK_CONNECTOR_BLOCK = BLOCKS.register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, NetworkConnectorBlock::new);
public static final RegistryObject<NetworkHubBlock> NETWORK_HUB_BLOCK = BLOCKS.register(Constants.NETWORK_HUB_BLOCK_NAME, NetworkHubBlock::new);
public static final RegistryObject<RedstoneInterfaceBlock> REDSTONE_INTERFACE_BLOCK = BLOCKS.register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, RedstoneInterfaceBlock::new);
public static final RegistryObject<ComputerBlock> COMPUTER = BLOCKS.register(Constants.COMPUTER_BLOCK_NAME, ComputerBlock::new);
public static final RegistryObject<BusCableBlock> BUS_CABLE = BLOCKS.register(Constants.BUS_CABLE_BLOCK_NAME, BusCableBlock::new);
public static final RegistryObject<NetworkConnectorBlock> NETWORK_CONNECTOR = BLOCKS.register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, NetworkConnectorBlock::new);
public static final RegistryObject<NetworkHubBlock> NETWORK_HUB = BLOCKS.register(Constants.NETWORK_HUB_BLOCK_NAME, NetworkHubBlock::new);
public static final RegistryObject<RedstoneInterfaceBlock> REDSTONE_INTERFACE = BLOCKS.register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, RedstoneInterfaceBlock::new);
///////////////////////////////////////////////////////////////////

4
src/main/java/li/cil/oc2/common/block/BusCableBlock.java
View File

@@ -165,7 +165,7 @@ public final class BusCableBlock extends Block {
}
if (plugCount > 0) {
drops.add(new ItemStack(Items.BUS_INTERFACE_ITEM.get(), plugCount));
drops.add(new ItemStack(Items.BUS_INTERFACE.get(), plugCount));
}
return drops;
@@ -289,7 +289,7 @@ public final class BusCableBlock extends Block {
onConnectionTypeChanged(world, pos, side);
if (!player.isCreative() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
ItemStackUtils.spawnAsEntity(world, pos, new ItemStack(Items.BUS_INTERFACE_ITEM.get()), side).ifPresent(entity -> {
ItemStackUtils.spawnAsEntity(world, pos, new ItemStack(Items.BUS_INTERFACE.get()), side).ifPresent(entity -> {
entity.setNoPickupDelay();
entity.onCollideWithPlayer(player);
});

2
src/main/java/li/cil/oc2/common/block/ComputerBlock.java
View File

@@ -182,7 +182,7 @@ public final class ComputerBlock extends HorizontalBlock {
computer.getItemStackHandlers().exportDeviceDataToItemStacks();
if (player.isCreative()) {
final ItemStack stack = new ItemStack(Items.COMPUTER_ITEM.get());
final ItemStack stack = new ItemStack(Items.COMPUTER.get());
computer.exportToItemStack(stack);
spawnAsEntity(world, pos, stack);
}

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
View File

@@ -18,7 +18,7 @@ import java.util.Optional;
public final class FlashMemoryItemDeviceProvider extends AbstractItemDeviceProvider {
public FlashMemoryItemDeviceProvider() {
super(Items.FLASH_MEMORY_ITEM);
super(Items.FLASH_MEMORY);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
View File

@@ -19,7 +19,7 @@ import java.util.Optional;
public final class HardDriveItemDeviceProvider extends AbstractItemDeviceProvider {
public HardDriveItemDeviceProvider() {
super(Items.HARD_DRIVE_ITEM);
super(Items.HARD_DRIVE);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java
View File

@@ -12,7 +12,7 @@ import java.util.Optional;
public final class MemoryItemDeviceProvider extends AbstractItemDeviceProvider {
public MemoryItemDeviceProvider() {
super(Items.MEMORY_ITEM);
super(Items.MEMORY);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java
View File

@@ -10,7 +10,7 @@ import java.util.Optional;
public final class NetworkInterfaceCardItemDeviceProvider extends AbstractItemDeviceProvider {
public NetworkInterfaceCardItemDeviceProvider() {
super(Items.NETWORK_INTERFACE_CARD_ITEM);
super(Items.NETWORK_INTERFACE_CARD);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java
View File

@@ -10,7 +10,7 @@ import java.util.Optional;
public final class RedstoneInterfaceCardItemDeviceProvider extends AbstractItemDeviceProvider {
public RedstoneInterfaceCardItemDeviceProvider() {
super(Items.REDSTONE_INTERFACE_CARD_ITEM);
super(Items.REDSTONE_INTERFACE_CARD);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/container/ComputerContainer.java
View File

@@ -67,6 +67,6 @@ public final class ComputerContainer extends AbstractContainer {
@Override
public boolean canInteractWith(final PlayerEntity player) {
return isWithinUsableDistance(IWorldPosCallable.of(computer.getWorld(), computer.getPos()), player, Blocks.COMPUTER_BLOCK.get());
return isWithinUsableDistance(IWorldPosCallable.of(computer.getWorld(), computer.getPos()), player, Blocks.COMPUTER.get());
}
}

2
src/main/java/li/cil/oc2/common/entity/RobotEntity.java
View File

@@ -214,7 +214,7 @@ public final class RobotEntity extends Entity implements Robot {
return;
}
final ItemStack stack = new ItemStack(Items.ROBOT_ITEM.get());
final ItemStack stack = new ItemStack(Items.ROBOT.get());
exportToItemStack(stack);
entityDropItem(stack);

9
src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java
View File

@@ -2,20 +2,13 @@ package li.cil.oc2.common.item;
import li.cil.oc2.common.block.Blocks;
import li.cil.oc2.common.block.BusCableBlock;
import li.cil.oc2.common.util.TooltipUtils;
import net.minecraft.block.BlockState;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public final class BusInterfaceItem extends ModItem {
public BusInterfaceItem(final Properties properties) {
@@ -30,7 +23,7 @@ public final class BusInterfaceItem extends ModItem {
final BlockPos pos = context.getPos();
final BlockState state = world.getBlockState(pos);
final BusCableBlock busCableBlock = Blocks.BUS_CABLE_BLOCK.get();
final BusCableBlock busCableBlock = Blocks.BUS_CABLE.get();
if (state.getBlock() == busCableBlock) {
final Vector3d localHitPos = context.getHitVec().subtract(Vector3d.copyCentered(pos));
final Direction side = Direction.getFacingFromVector(localHitPos.x, localHitPos.y, localHitPos.z);

4
src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
View File

@@ -23,7 +23,7 @@ public final class FlashMemoryItem extends AbstractStorageItem {
///////////////////////////////////////////////////////////////////
public static ItemStack withCapacity(final int capacity) {
return withCapacity(new ItemStack(Items.FLASH_MEMORY_ITEM.get()), capacity);
return withCapacity(new ItemStack(Items.FLASH_MEMORY.get()), capacity);
}
@Nullable
@@ -62,7 +62,7 @@ public final class FlashMemoryItem extends AbstractStorageItem {
}
public static ItemStack withFirmware(final Firmware firmware) {
return withFirmware(new ItemStack(Items.FLASH_MEMORY_ITEM.get()), firmware);
return withFirmware(new ItemStack(Items.FLASH_MEMORY.get()), firmware);
}
///////////////////////////////////////////////////////////////////

4
src/main/java/li/cil/oc2/common/item/HardDriveItem.java
View File

@@ -22,7 +22,7 @@ public final class HardDriveItem extends AbstractStorageItem {
///////////////////////////////////////////////////////////////////
public static ItemStack withCapacity(final int capacity) {
return withCapacity(new ItemStack(Items.HARD_DRIVE_ITEM.get()), capacity);
return withCapacity(new ItemStack(Items.HARD_DRIVE.get()), capacity);
}
@Nullable
@@ -61,7 +61,7 @@ public final class HardDriveItem extends AbstractStorageItem {
}
public static ItemStack withBase(final BaseBlockDevice baseBlockDevice) {
return withBase(new ItemStack(Items.HARD_DRIVE_ITEM.get()), baseBlockDevice);
return withBase(new ItemStack(Items.HARD_DRIVE.get()), baseBlockDevice);
}
public static boolean isReadonly(final ItemStack stack) {

7
src/main/java/li/cil/oc2/common/item/ItemGroup.java
View File

@@ -6,7 +6,6 @@ import li.cil.oc2.common.Constants;
import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
import li.cil.oc2.common.bus.device.data.Firmwares;
import li.cil.oc2.common.util.ItemStackUtils;
import li.cil.oc2.common.vm.AbstractVirtualMachineItemStackHandlers;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.NonNullList;
@@ -19,7 +18,7 @@ public final class ItemGroup {
public static final net.minecraft.item.ItemGroup COMMON = new net.minecraft.item.ItemGroup(API.MOD_ID + ".common") {
@Override
public ItemStack createIcon() {
return new ItemStack(Items.COMPUTER_ITEM.get());
return new ItemStack(Items.COMPUTER.get());
}
@Override
@@ -44,7 +43,7 @@ public final class ItemGroup {
}
private ItemStack getPreconfiguredComputer() {
final ItemStack computer = new ItemStack(Items.COMPUTER_ITEM.get());
final ItemStack computer = new ItemStack(Items.COMPUTER.get());
final CompoundNBT computerItems = ItemStackUtils.getOrCreateTileEntityInventoryTag(computer);
computerItems.put(DeviceTypes.MEMORY.getRegistryName().toString(), makeInventoryTag(
@@ -59,7 +58,7 @@ public final class ItemGroup {
FlashMemoryItem.withFirmware(Firmwares.BUILDROOT.get())
));
computerItems.put(DeviceTypes.CARD.getRegistryName().toString(), makeInventoryTag(
new ItemStack(Items.NETWORK_INTERFACE_CARD_ITEM.get())
new ItemStack(Items.NETWORK_INTERFACE_CARD.get())
));
return computer;

28
src/main/java/li/cil/oc2/common/item/Items.java
View File

@@ -18,25 +18,25 @@ public final class Items {
///////////////////////////////////////////////////////////////////
public static final RegistryObject<Item> COMPUTER_ITEM = register(Constants.COMPUTER_BLOCK_NAME, Blocks.COMPUTER_BLOCK);
public static final RegistryObject<Item> BUS_CABLE_ITEM = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE_BLOCK);
public static final RegistryObject<Item> NETWORK_CONNECTOR_ITEM = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR_BLOCK);
public static final RegistryObject<Item> NETWORK_HUB_ITEM = register(Constants.NETWORK_HUB_BLOCK_NAME, Blocks.NETWORK_HUB_BLOCK);
public static final RegistryObject<Item> REDSTONE_INTERFACE_ITEM = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE_BLOCK);
public static final RegistryObject<Item> COMPUTER = register(Constants.COMPUTER_BLOCK_NAME, Blocks.COMPUTER);
public static final RegistryObject<Item> BUS_CABLE = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE);
public static final RegistryObject<Item> NETWORK_CONNECTOR = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR);
public static final RegistryObject<Item> NETWORK_HUB = register(Constants.NETWORK_HUB_BLOCK_NAME, Blocks.NETWORK_HUB);
public static final RegistryObject<Item> REDSTONE_INTERFACE = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE);
///////////////////////////////////////////////////////////////////
public static final RegistryObject<Item> WRENCH_ITEM = register(Constants.WRENCH_ITEM_NAME, WrenchItem::new);
public static final RegistryObject<Item> WRENCH = register(Constants.WRENCH_ITEM_NAME, WrenchItem::new);
public static final RegistryObject<Item> BUS_INTERFACE_ITEM = register(Constants.BUS_INTERFACE_ITEM_NAME, BusInterfaceItem::new);
public static final RegistryObject<Item> NETWORK_CABLE_ITEM = register(Constants.NETWORK_CABLE_ITEM_NAME, NetworkCableItem::new);
public static final RegistryObject<Item> ROBOT_ITEM = register(Constants.ROBOT_ENTITY_NAME, RobotItem::new, commonProperties().setISTER(() -> RobotItemStackRenderer::new));
public static final RegistryObject<Item> BUS_INTERFACE = register(Constants.BUS_INTERFACE_ITEM_NAME, BusInterfaceItem::new);
public static final RegistryObject<Item> NETWORK_CABLE = register(Constants.NETWORK_CABLE_ITEM_NAME, NetworkCableItem::new);
public static final RegistryObject<Item> ROBOT = register(Constants.ROBOT_ENTITY_NAME, RobotItem::new, commonProperties().setISTER(() -> RobotItemStackRenderer::new));
public static final RegistryObject<Item> MEMORY_ITEM = register(Constants.MEMORY_ITEM_NAME, MemoryItem::new, new Item.Properties());
public static final RegistryObject<Item> HARD_DRIVE_ITEM = register(Constants.HARD_DRIVE_ITEM_NAME, HardDriveItem::new, new Item.Properties());
public static final RegistryObject<Item> FLASH_MEMORY_ITEM = register(Constants.FLASH_MEMORY_ITEM_NAME, FlashMemoryItem::new, new Item.Properties());
public static final RegistryObject<Item> REDSTONE_INTERFACE_CARD_ITEM = register(Constants.REDSTONE_INTERFACE_CARD_ITEM_NAME);
public static final RegistryObject<Item> NETWORK_INTERFACE_CARD_ITEM = register(Constants.NETWORK_INTERFACE_CARD_ITEM_NAME);
public static final RegistryObject<Item> MEMORY = register(Constants.MEMORY_ITEM_NAME, MemoryItem::new, new Item.Properties());
public static final RegistryObject<Item> HARD_DRIVE = register(Constants.HARD_DRIVE_ITEM_NAME, HardDriveItem::new, new Item.Properties());
public static final RegistryObject<Item> FLASH_MEMORY = register(Constants.FLASH_MEMORY_ITEM_NAME, FlashMemoryItem::new, new Item.Properties());
public static final RegistryObject<Item> REDSTONE_INTERFACE_CARD = register(Constants.REDSTONE_INTERFACE_CARD_ITEM_NAME);
public static final RegistryObject<Item> NETWORK_INTERFACE_CARD = register(Constants.NETWORK_INTERFACE_CARD_ITEM_NAME);
public static final RegistryObject<Item> INVENTORY_OPERATIONS_MODULE = register(Constants.INVENTORY_OPERATIONS_MODULE_ITEM_NAME);
public static final RegistryObject<Item> BLOCK_OPERATIONS_MODULE = register(Constants.BLOCK_OPERATIONS_MODULE_ITEM_NAME, commonProperties().maxDamage(2500));

2
src/main/java/li/cil/oc2/common/item/MemoryItem.java
View File

@@ -9,7 +9,7 @@ public final class MemoryItem extends AbstractStorageItem {
///////////////////////////////////////////////////////////////////
public static ItemStack withCapacity(final int capacity) {
return withCapacity(new ItemStack(Items.MEMORY_ITEM.get()), capacity);
return withCapacity(new ItemStack(Items.MEMORY.get()), capacity);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/tileentity/NetworkConnectorTileEntity.java
View File

@@ -139,7 +139,7 @@ public final class NetworkConnectorTileEntity extends AbstractTileEntity impleme
final World world = getWorld();
if (world != null) {
final Vector3d middle = Vector3d.copyCentered(getPos().add(pos)).scale(0.5f);
ItemStackUtils.spawnAsEntity(world, middle, new ItemStack(Items.NETWORK_CABLE_ITEM.get()));
ItemStackUtils.spawnAsEntity(world, middle, new ItemStack(Items.NETWORK_CABLE.get()));
}
}

10
src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
View File

@@ -18,11 +18,11 @@ public final class TileEntities {
///////////////////////////////////////////////////////////////////
public static final RegistryObject<TileEntityType<RedstoneInterfaceTileEntity>> REDSTONE_INTERFACE_TILE_ENTITY = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE_BLOCK, RedstoneInterfaceTileEntity::new);
public static final RegistryObject<TileEntityType<BusCableTileEntity>> BUS_CABLE_TILE_ENTITY = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE_BLOCK, BusCableTileEntity::new);
public static final RegistryObject<TileEntityType<ComputerTileEntity>> COMPUTER_TILE_ENTITY = register(Constants.COMPUTER_BLOCK_NAME, Blocks.COMPUTER_BLOCK, ComputerTileEntity::new);
public static final RegistryObject<TileEntityType<NetworkConnectorTileEntity>> NETWORK_CONNECTOR_TILE_ENTITY = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR_BLOCK, NetworkConnectorTileEntity::new);
public static final RegistryObject<TileEntityType<NetworkHubTileEntity>> NETWORK_HUB_TILE_ENTITY = register(Constants.NETWORK_HUB_BLOCK_NAME, Blocks.NETWORK_HUB_BLOCK, NetworkHubTileEntity::new);
public static final RegistryObject<TileEntityType<RedstoneInterfaceTileEntity>> REDSTONE_INTERFACE_TILE_ENTITY = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE, RedstoneInterfaceTileEntity::new);
public static final RegistryObject<TileEntityType<BusCableTileEntity>> BUS_CABLE_TILE_ENTITY = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE, BusCableTileEntity::new);
public static final RegistryObject<TileEntityType<ComputerTileEntity>> COMPUTER_TILE_ENTITY = register(Constants.COMPUTER_BLOCK_NAME, Blocks.COMPUTER, ComputerTileEntity::new);
public static final RegistryObject<TileEntityType<NetworkConnectorTileEntity>> NETWORK_CONNECTOR_TILE_ENTITY = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR, NetworkConnectorTileEntity::new);
public static final RegistryObject<TileEntityType<NetworkHubTileEntity>> NETWORK_HUB_TILE_ENTITY = register(Constants.NETWORK_HUB_BLOCK_NAME, Blocks.NETWORK_HUB, NetworkHubTileEntity::new);
///////////////////////////////////////////////////////////////////

14
src/main/java/li/cil/oc2/data/ModBlockStateProvider.java
View File

@@ -20,9 +20,9 @@ public class ModBlockStateProvider extends BlockStateProvider {
@Override
protected void registerStatesAndModels() {
horizontalBlock(Blocks.COMPUTER_BLOCK, Items.COMPUTER_ITEM);
horizontalBlock(Blocks.REDSTONE_INTERFACE_BLOCK, Items.REDSTONE_INTERFACE_ITEM);
horizontalFaceBlock(Blocks.NETWORK_CONNECTOR_BLOCK, Items.NETWORK_CONNECTOR_ITEM)
horizontalBlock(Blocks.COMPUTER, Items.COMPUTER);
horizontalBlock(Blocks.REDSTONE_INTERFACE, Items.REDSTONE_INTERFACE);
horizontalFaceBlock(Blocks.NETWORK_CONNECTOR, Items.NETWORK_CONNECTOR)
.transforms()
.transform(ModelBuilder.Perspective.GUI)
.rotation(30, 315, 0)
@@ -34,7 +34,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
.translation(0, 0, -5)
.end()
.end();
horizontalBlock(Blocks.NETWORK_HUB_BLOCK, Items.NETWORK_HUB_ITEM);
horizontalBlock(Blocks.NETWORK_HUB, Items.NETWORK_HUB);
registerCableStates();
}
@@ -44,7 +44,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
final ModelFile linkModel = models().getExistingFile(new ResourceLocation(API.MOD_ID, "block/cable_link"));
final ModelFile plugModel = models().getExistingFile(new ResourceLocation(API.MOD_ID, "block/cable_plug"));
final MultiPartBlockStateBuilder builder = getMultipartBuilder(Blocks.BUS_CABLE_BLOCK.get());
final MultiPartBlockStateBuilder builder = getMultipartBuilder(Blocks.BUS_CABLE.get());
// NB: We use a custom model loader + baked model to replace the base part with straight parts and
// insert supports where appropriate.
@@ -78,7 +78,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
.end();
});
itemModels().getBuilder(Items.BUS_CABLE_ITEM.getId().getPath())
itemModels().getBuilder(Items.BUS_CABLE.getId().getPath())
.parent(baseModel)
.transforms()
.transform(ModelBuilder.Perspective.GUI)
@@ -107,7 +107,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
.scale(0.75f)
.end();
itemModels().getBuilder(Items.BUS_INTERFACE_ITEM.getId().getPath())
itemModels().getBuilder(Items.BUS_INTERFACE.getId().getPath())
.parent(plugModel)
.transforms()
.transform(ModelBuilder.Perspective.GUI)

4
src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java
View File

@@ -17,7 +17,7 @@ public final class ModBlockTagsProvider extends BlockTagsProvider {
@Override
protected void registerTags() {
getOrCreateBuilder(DEVICES).add(COMPUTER_BLOCK.get(), REDSTONE_INTERFACE_BLOCK.get());
getOrCreateBuilder(CABLES).add(BUS_CABLE_BLOCK.get());
getOrCreateBuilder(DEVICES).add(COMPUTER.get(), REDSTONE_INTERFACE.get());
getOrCreateBuilder(CABLES).add(BUS_CABLE.get());
}
}

22
src/main/java/li/cil/oc2/data/ModItemModelProvider.java
View File

@@ -19,31 +19,31 @@ public final class ModItemModelProvider extends ItemModelProvider {
@Override
protected void registerModels() {
simple(Items.WRENCH_ITEM, "item/wrench");
simple(Items.WRENCH, "item/wrench");
simple(Items.NETWORK_CABLE_ITEM, "item/network_cable");
simple(Items.NETWORK_CABLE, "item/network_cable");
simple(Items.MEMORY_ITEM, "item/memory1")
simple(Items.MEMORY, "item/memory1")
.override()
.predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE)
.model(simple(Items.MEMORY_ITEM, "item/memory2", "2"))
.model(simple(Items.MEMORY, "item/memory2", "2"))
.end()
.override()
.predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE)
.model(simple(Items.MEMORY_ITEM, "item/memory3", "3"))
.model(simple(Items.MEMORY, "item/memory3", "3"))
.end();
simple(Items.HARD_DRIVE_ITEM, "item/hard_drive1")
simple(Items.HARD_DRIVE, "item/hard_drive1")
.override()
.predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE)
.model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive2", "2"))
.model(simple(Items.HARD_DRIVE, "item/hard_drive2", "2"))
.end()
.override()
.predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE)
.model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive3", "3"))
.model(simple(Items.HARD_DRIVE, "item/hard_drive3", "3"))
.end();
simple(Items.FLASH_MEMORY_ITEM, "item/flash_memory");
simple(Items.REDSTONE_INTERFACE_CARD_ITEM, "item/redstone_interface_card");
simple(Items.NETWORK_INTERFACE_CARD_ITEM, "item/network_interface_card");
simple(Items.FLASH_MEMORY, "item/flash_memory");
simple(Items.REDSTONE_INTERFACE_CARD, "item/redstone_interface_card");
simple(Items.NETWORK_INTERFACE_CARD, "item/network_interface_card");
simple(Items.INVENTORY_OPERATIONS_MODULE, "item/inventory_operations_module");
simple(Items.BLOCK_OPERATIONS_MODULE, "item/block_operations_module");

20
src/main/java/li/cil/oc2/data/ModItemTagsProvider.java
View File

@@ -32,17 +32,17 @@ public final class ModItemTagsProvider extends ItemTagsProvider {
DEVICES_ROBOT_MODULE
);
getOrCreateBuilder(DEVICES_MEMORY).add(
Items.MEMORY_ITEM.get()
Items.MEMORY.get()
);
getOrCreateBuilder(DEVICES_HARD_DRIVE).add(
Items.HARD_DRIVE_ITEM.get()
Items.HARD_DRIVE.get()
);
getOrCreateBuilder(DEVICES_FLASH_MEMORY).add(
Items.FLASH_MEMORY_ITEM.get()
Items.FLASH_MEMORY.get()
);
getOrCreateBuilder(DEVICES_CARD).add(
Items.REDSTONE_INTERFACE_CARD_ITEM.get(),
Items.NETWORK_INTERFACE_CARD_ITEM.get()
Items.REDSTONE_INTERFACE_CARD.get(),
Items.NETWORK_INTERFACE_CARD.get()
);
getOrCreateBuilder(DEVICES_ROBOT_MODULE).add(
Items.INVENTORY_OPERATIONS_MODULE.get(),
@@ -76,13 +76,13 @@ public final class ModItemTagsProvider extends ItemTagsProvider {
Tags.Items.INGOTS_NETHERITE
);
getOrCreateBuilder(WRENCHES).add(Items.WRENCH_ITEM.get());
getOrCreateBuilder(WRENCHES).add(Items.WRENCH.get());
getOrCreateBuilder(DEVICE_NEEDS_REBOOT).add(
Items.MEMORY_ITEM.get(),
Items.HARD_DRIVE_ITEM.get(),
Items.FLASH_MEMORY_ITEM.get(),
Items.NETWORK_INTERFACE_CARD_ITEM.get()
Items.MEMORY.get(),
Items.HARD_DRIVE.get(),
Items.FLASH_MEMORY.get(),
Items.NETWORK_INTERFACE_CARD.get()
);
}
}

10
src/main/java/li/cil/oc2/data/ModLootTableProvider.java
View File

@@ -42,12 +42,12 @@ public final class ModLootTableProvider extends LootTableProvider {
public static final class ModBlockLootTables extends BlockLootTables {
@Override
protected void addTables() {
registerDropSelfLootTable(Blocks.BUS_CABLE_BLOCK.get());
registerDropSelfLootTable(Blocks.REDSTONE_INTERFACE_BLOCK.get());
registerDropSelfLootTable(Blocks.NETWORK_CONNECTOR_BLOCK.get());
registerDropSelfLootTable(Blocks.NETWORK_HUB_BLOCK.get());
registerDropSelfLootTable(Blocks.BUS_CABLE.get());
registerDropSelfLootTable(Blocks.REDSTONE_INTERFACE.get());
registerDropSelfLootTable(Blocks.NETWORK_CONNECTOR.get());
registerDropSelfLootTable(Blocks.NETWORK_HUB.get());
registerLootTable(Blocks.COMPUTER_BLOCK.get(), ModBlockLootTables::droppingWithInventory);
registerLootTable(Blocks.COMPUTER.get(), ModBlockLootTables::droppingWithInventory);
}
@Override