diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/APUItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/APUItem.java new file mode 100644 index 0000000..266e92d --- /dev/null +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/APUItem.java @@ -0,0 +1,42 @@ +package li.cil.ocreloaded.minecraft.common.item; + +import java.util.UUID; + +import li.cil.ocreloaded.core.component.GraphicsCardComponent; +import li.cil.ocreloaded.core.network.NetworkNode; +import li.cil.ocreloaded.core.network.NetworkNode.Visibility; +import li.cil.ocreloaded.core.network.NetworkNodes; +import net.minecraft.world.item.Item; + +public class APUItem extends Item implements ProcessorProviderItem, ComponentItem { + + //TODO: Move this to a conifg + public static int[][] TIER_RESOLUTIONS = new int[][] { + new int[] { 50, 16 }, + new int[] { 80, 25 }, + new int[] { 160, 50 }, + }; + + public static int[] TIER_DEPTHS = new int[] { 1, 4, 8 }; + + private final int tier; + + public APUItem(Properties properties, int tier) { + super(properties); + this.tier = tier; + } + + @Override + public int getTier() { + return this.tier; + } + + @Override + public NetworkNode newNetworkNode(UUID uuid) { + return NetworkNodes.component( + uuid, + node -> new GraphicsCardComponent(node, TIER_RESOLUTIONS[tier - 1], TIER_DEPTHS[tier - 1]), + Visibility.NEIGHBORS); + } + +} diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CPUItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CPUItem.java index f2bc65f..bf09f34 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CPUItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CPUItem.java @@ -2,7 +2,7 @@ import net.minecraft.world.item.Item; -public class CPUItem extends Item implements TieredItem { +public class CPUItem extends Item implements ProcessorProviderItem { private final int tier; diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CardItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CardItem.java new file mode 100644 index 0000000..f48ddf7 --- /dev/null +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/CardItem.java @@ -0,0 +1,5 @@ +package li.cil.ocreloaded.minecraft.common.item; + +public interface CardItem extends TieredItem, ComponentItem, SlotItem { + +} diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/EepromItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/EepromItem.java index 76819c2..8712c5f 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/EepromItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/EepromItem.java @@ -13,7 +13,7 @@ import li.cil.ocreloaded.core.network.NetworkNodes; import net.minecraft.world.item.Item; -public class EepromItem extends Item implements ComponentItem { +public class EepromItem extends Item implements SlotItem, ComponentItem { private static final Logger LOGGER = LoggerFactory.getLogger(EepromItem.class); private final String defaultCode; diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/FloppyDiskItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/FloppyDiskItem.java index 10ce4a5..eac5981 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/FloppyDiskItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/FloppyDiskItem.java @@ -10,7 +10,7 @@ import li.cil.ocreloaded.core.machine.filesystem.FileSystemSupplierRegistry; import net.minecraft.world.item.Item; -public class FloppyDiskItem extends Item implements ComponentItem { +public class FloppyDiskItem extends Item implements SlotItem, ComponentItem { private static FileSystemSupplierRegistry fileSystemFactory = FileSystemSupplierRegistry.getDefaultInstance(); diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/GraphicsCardItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/GraphicsCardItem.java index 7af011f..9b961cc 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/GraphicsCardItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/GraphicsCardItem.java @@ -8,7 +8,7 @@ import li.cil.ocreloaded.core.network.NetworkNodes; import net.minecraft.world.item.Item; -public class GraphicsCardItem extends Item implements TieredItem, ComponentItem { +public class GraphicsCardItem extends Item implements CardItem { //TODO: Move this to a conifg public static int[][] TIER_RESOLUTIONS = new int[][] { new int[] { 50, 16 }, diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/HardDiskItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/HardDiskItem.java index 5b09db1..14b981a 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/HardDiskItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/HardDiskItem.java @@ -10,7 +10,8 @@ import li.cil.ocreloaded.core.machine.filesystem.FileSystemSupplierRegistry; import net.minecraft.world.item.Item; -public class HardDiskItem extends Item implements TieredItem, ComponentItem { +public class HardDiskItem extends Item implements SlotItem, TieredItem, ComponentItem { + private static FileSystemSupplierRegistry fileSystemFactory = FileSystemSupplierRegistry.getDefaultInstance(); private final int tier; diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/MemoryItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/MemoryItem.java index cfa8f78..9f4431a 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/MemoryItem.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/MemoryItem.java @@ -2,7 +2,7 @@ import net.minecraft.world.item.Item; -public class MemoryItem extends Item implements TieredItem { +public class MemoryItem extends Item implements SlotItem, TieredItem { private final int tier; diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/ProcessorProviderItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/ProcessorProviderItem.java new file mode 100644 index 0000000..57e11fa --- /dev/null +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/ProcessorProviderItem.java @@ -0,0 +1,5 @@ +package li.cil.ocreloaded.minecraft.common.item; + +public interface ProcessorProviderItem extends TieredItem, SlotItem { + +} diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/SlotItem.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/SlotItem.java new file mode 100644 index 0000000..dd6e9cb --- /dev/null +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/item/SlotItem.java @@ -0,0 +1,5 @@ +package li.cil.ocreloaded.minecraft.common.item; + +public interface SlotItem { + +} diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/CaseMenu.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/CaseMenu.java index b6fa2f6..48be57c 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/CaseMenu.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/CaseMenu.java @@ -7,12 +7,13 @@ import li.cil.ocreloaded.minecraft.common.assets.SharedTextures; import li.cil.ocreloaded.minecraft.common.container.BasicContainer; import li.cil.ocreloaded.minecraft.common.entity.CaseBlockEntity; -import li.cil.ocreloaded.minecraft.common.item.CPUItem; +import li.cil.ocreloaded.minecraft.common.item.CardItem; import li.cil.ocreloaded.minecraft.common.item.EepromItem; import li.cil.ocreloaded.minecraft.common.item.FloppyDiskItem; -import li.cil.ocreloaded.minecraft.common.item.GraphicsCardItem; import li.cil.ocreloaded.minecraft.common.item.HardDiskItem; import li.cil.ocreloaded.minecraft.common.item.MemoryItem; +import li.cil.ocreloaded.minecraft.common.item.ProcessorProviderItem; +import li.cil.ocreloaded.minecraft.common.item.SlotItem; import li.cil.ocreloaded.minecraft.common.network.IPlatformNetworkHelper; import li.cil.ocreloaded.minecraft.common.network.packets.PowerPacket; import li.cil.ocreloaded.minecraft.common.registry.CommonRegistered; @@ -25,34 +26,33 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.DataSlot; import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; public class CaseMenu extends AbstractContainerMenu { private static final List> COMPONENT_SLOTS = List.of( List.of( - new ComponentSlotEntry(0, 0, GraphicsCardItem.class, SharedTextures.CARD_ICON, 1), - new ComponentSlotEntry(0, 1, GraphicsCardItem.class, SharedTextures.CARD_ICON, 1), - new ComponentSlotEntry(1, 0, CPUItem.class, SharedTextures.CPU_ICON, 1), + new ComponentSlotEntry(0, 0, CardItem.class, SharedTextures.CARD_ICON, 1), + new ComponentSlotEntry(0, 1, CardItem.class, SharedTextures.CARD_ICON, 1), + new ComponentSlotEntry(1, 0, ProcessorProviderItem.class, SharedTextures.CPU_ICON, 1), new ComponentSlotEntry(1, 1, MemoryItem.class, SharedTextures.MEMORY_ICON, 1), new ComponentSlotEntry(1, 2, MemoryItem.class, SharedTextures.MEMORY_ICON, 1), new ComponentSlotEntry(2, 0, HardDiskItem.class, SharedTextures.HDD_ICON, 1) ), List.of( - new ComponentSlotEntry(0, 0, GraphicsCardItem.class, SharedTextures.CARD_ICON, 2), - new ComponentSlotEntry(0, 1, GraphicsCardItem.class, SharedTextures.CARD_ICON, 1), - new ComponentSlotEntry(1, 0, CPUItem.class, SharedTextures.CPU_ICON, 2), + new ComponentSlotEntry(0, 0, CardItem.class, SharedTextures.CARD_ICON, 2), + new ComponentSlotEntry(0, 1, CardItem.class, SharedTextures.CARD_ICON, 1), + new ComponentSlotEntry(1, 0, ProcessorProviderItem.class, SharedTextures.CPU_ICON, 2), new ComponentSlotEntry(1, 1, MemoryItem.class, SharedTextures.MEMORY_ICON, 2), new ComponentSlotEntry(1, 2, MemoryItem.class, SharedTextures.MEMORY_ICON, 2), new ComponentSlotEntry(2, 0, HardDiskItem.class, SharedTextures.HDD_ICON, 2), new ComponentSlotEntry(2, 1, HardDiskItem.class, SharedTextures.HDD_ICON, 1) ), List.of( - new ComponentSlotEntry(0, 0, GraphicsCardItem.class, SharedTextures.CARD_ICON, 3), - new ComponentSlotEntry(0, 1, GraphicsCardItem.class, SharedTextures.CARD_ICON, 2), - new ComponentSlotEntry(0, 2, GraphicsCardItem.class, SharedTextures.CARD_ICON, 2), - new ComponentSlotEntry(1, 0, CPUItem.class, SharedTextures.CPU_ICON, 3), + new ComponentSlotEntry(0, 0, CardItem.class, SharedTextures.CARD_ICON, 3), + new ComponentSlotEntry(0, 1, CardItem.class, SharedTextures.CARD_ICON, 2), + new ComponentSlotEntry(0, 2, CardItem.class, SharedTextures.CARD_ICON, 2), + new ComponentSlotEntry(1, 0, ProcessorProviderItem.class, SharedTextures.CPU_ICON, 3), new ComponentSlotEntry(1, 1, MemoryItem.class, SharedTextures.MEMORY_ICON, 3), new ComponentSlotEntry(1, 2, MemoryItem.class, SharedTextures.MEMORY_ICON, 3), new ComponentSlotEntry(2, 0, HardDiskItem.class, SharedTextures.HDD_ICON, 3), @@ -60,10 +60,10 @@ public class CaseMenu extends AbstractContainerMenu { new ComponentSlotEntry(2, 2, FloppyDiskItem.class, SharedTextures.FLOPPY_ICON, 1) ), List.of( - new ComponentSlotEntry(0, 0, GraphicsCardItem.class, SharedTextures.CARD_ICON, 3), - new ComponentSlotEntry(0, 1, GraphicsCardItem.class, SharedTextures.CARD_ICON, 3), - new ComponentSlotEntry(0, 2, GraphicsCardItem.class, SharedTextures.CARD_ICON, 3), - new ComponentSlotEntry(1, 0, CPUItem.class, SharedTextures.CPU_ICON, 3), + new ComponentSlotEntry(0, 0, CardItem.class, SharedTextures.CARD_ICON, 3), + new ComponentSlotEntry(0, 1, CardItem.class, SharedTextures.CARD_ICON, 3), + new ComponentSlotEntry(0, 2, CardItem.class, SharedTextures.CARD_ICON, 3), + new ComponentSlotEntry(1, 0, ProcessorProviderItem.class, SharedTextures.CPU_ICON, 3), new ComponentSlotEntry(1, 1, MemoryItem.class, SharedTextures.MEMORY_ICON, 3), new ComponentSlotEntry(1, 2, MemoryItem.class, SharedTextures.MEMORY_ICON, 3), new ComponentSlotEntry(2, 0, HardDiskItem.class, SharedTextures.HDD_ICON, 3), @@ -157,6 +157,6 @@ private void addComponentSlot(ComponentSlotEntry entry) { entry.teir())); } - private record ComponentSlotEntry(int x, int y, Class itemClass, ResourceLocation texture, int teir) { } + private record ComponentSlotEntry(int x, int y, Class itemClass, ResourceLocation texture, int teir) { } } diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/ComponentSlot.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/ComponentSlot.java index 62f548a..9ab24c4 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/ComponentSlot.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/menu/ComponentSlot.java @@ -2,27 +2,27 @@ import javax.annotation.Nonnull; +import li.cil.ocreloaded.minecraft.common.item.SlotItem; import li.cil.ocreloaded.minecraft.common.item.TieredItem; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; public class ComponentSlot extends Slot { - private final Class itemClass; + private final Class itemClass; private final ResourceLocation texture; private final int teir; - public ComponentSlot(Container container, int index, int x, int y, Class itemClass, ResourceLocation texture, int tier) { + public ComponentSlot(Container container, int index, int x, int y, Class itemClass, ResourceLocation texture, int tier) { super(container, index, x, y); this.itemClass = itemClass; this.texture = texture; this.teir = tier; } - public ComponentSlot(Container container, int index, int x, int y, Class itemClass, ResourceLocation texture) { + public ComponentSlot(Container container, int index, int x, int y, Class itemClass, ResourceLocation texture) { this(container, index, x, y, itemClass, texture, 0); } diff --git a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/registry/CommonRegistered.java b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/registry/CommonRegistered.java index 795d507..b48dec8 100644 --- a/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/registry/CommonRegistered.java +++ b/projects/Minecraft/src/main/java/li/cil/ocreloaded/minecraft/common/registry/CommonRegistered.java @@ -11,6 +11,7 @@ import li.cil.ocreloaded.minecraft.common.entity.CaseBlockEntity; import li.cil.ocreloaded.minecraft.common.entity.KeyboardBlockEntity; import li.cil.ocreloaded.minecraft.common.entity.ScreenBlockEntity; +import li.cil.ocreloaded.minecraft.common.item.APUItem; import li.cil.ocreloaded.minecraft.common.item.CPUItem; import li.cil.ocreloaded.minecraft.common.item.DataCardItem; import li.cil.ocreloaded.minecraft.common.item.EepromItem; @@ -51,10 +52,6 @@ public class CommonRegistered { public static void initialize() { NetworkUtil.initialize(); - - /*NetworkUtil.getInstance().registerHandler("ocreloaded:power", new PowerNetworkHandler()); - NetworkUtil.getInstance().registerHandler("ocreloaded:screen", new ScreenNetworkHandler()); - NetworkUtil.getInstance().registerHandler("ocreloaded:sound", new SoundNetworkHandler());*/ } // Creative mode tabs @@ -106,9 +103,9 @@ public static void initialize() { public static final RegistryObject DISK = registerItem("disk", () -> new Item(DEFAULT_ITEM_PROPERTIES)); - public static final RegistryObject CHIP_TIER_1 = registerItem("chip1", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 1)); - public static final RegistryObject CHIP_TIER_2 = registerItem("chip2", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 2)); - public static final RegistryObject CHIP_TIER_3 = registerItem("chip3", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 3)); + public static final RegistryObject CHIP_TIER_1 = registerItem("chip1", () -> new Item(DEFAULT_ITEM_PROPERTIES)); + public static final RegistryObject CHIP_TIER_2 = registerItem("chip2", () -> new Item(DEFAULT_ITEM_PROPERTIES)); + public static final RegistryObject CHIP_TIER_3 = registerItem("chip3", () -> new Item(DEFAULT_ITEM_PROPERTIES)); public static final RegistryObject NUMPAD = registerItem("numpad", () -> new Item(DEFAULT_ITEM_PROPERTIES)); @@ -118,6 +115,10 @@ public static void initialize() { public static final RegistryObject TRANSISTOR = registerItem("transistor", () -> new Item(DEFAULT_ITEM_PROPERTIES)); public static final RegistryObject MANUAL = registerItem("manual", () -> new ManualItem(DEFAULT_ITEM_PROPERTIES)); + public static final RegistryObject APU_TIER_1 = registerItem("apu1", () -> new APUItem(DEFAULT_ITEM_PROPERTIES, 2)); + public static final RegistryObject APU_TIER_2 = registerItem("apu2", () -> new APUItem(DEFAULT_ITEM_PROPERTIES, 3)); + public static final RegistryObject APU_TIER_3 = registerItem("apucreative", () -> new APUItem(DEFAULT_ITEM_PROPERTIES, 3)); + public static final RegistryObject CPU_TIER_1 = registerItem("cpu1", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 1)); public static final RegistryObject CPU_TIER_2 = registerItem("cpu2", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 2)); public static final RegistryObject CPU_TIER_3 = registerItem("cpu3", () -> new CPUItem(DEFAULT_ITEM_PROPERTIES, 3)); diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/lang/en_us.json b/projects/Minecraft/src/main/resources/assets/ocreloaded/lang/en_us.json index af6f963..8017e44 100644 --- a/projects/Minecraft/src/main/resources/assets/ocreloaded/lang/en_us.json +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/lang/en_us.json @@ -12,6 +12,9 @@ "gui.ocreloaded.case.power_on": "Turn on", "gui.ocreloaded.case.power_on_line2": "§7Use an Analyzer to troubleshoot errors.§r", "item.ocreloaded.alu": "Arithmetic Logic Unit (ALU)", + "item.ocreloaded.apu1": "Accelerated Processing Unit (APU) (Tier 2)", + "item.ocreloaded.apu2": "Accelerated Processing Unit (APU) (Tier 3)", + "item.ocreloaded.apucreative": "Accelerated Processing Unit (APU) (Creative)", "item.ocreloaded.arrow_keys": "Arrow Keys", "item.ocreloaded.button_group": "Button Group", "item.ocreloaded.card": "Card Base", diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu1.json b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu1.json new file mode 100644 index 0000000..e4a4420 --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ocreloaded:item/apu1" + } +} \ No newline at end of file diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu2.json b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu2.json new file mode 100644 index 0000000..4405493 --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apu2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ocreloaded:item/apu2" + } +} \ No newline at end of file diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apucreative.json b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apucreative.json new file mode 100644 index 0000000..35150aa --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/models/item/apucreative.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ocreloaded:item/apucreative" + } +} \ No newline at end of file diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png new file mode 100644 index 0000000..a424643 Binary files /dev/null and b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png differ diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png.mcmeta b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png.mcmeta new file mode 100644 index 0000000..622c313 --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu1.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + { "index": 0, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 5, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 0, "time": 3 } + ] + } +} \ No newline at end of file diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png new file mode 100644 index 0000000..bc7a838 Binary files /dev/null and b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png differ diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png.mcmeta b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png.mcmeta new file mode 100644 index 0000000..622c313 --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apu2.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + { "index": 0, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 5, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 0, "time": 3 } + ] + } +} \ No newline at end of file diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png new file mode 100644 index 0000000..4a09b42 Binary files /dev/null and b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png differ diff --git a/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png.mcmeta b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png.mcmeta new file mode 100644 index 0000000..622c313 --- /dev/null +++ b/projects/Minecraft/src/main/resources/assets/ocreloaded/textures/item/apucreative.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + { "index": 0, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 5, "time": 3 }, + { "index": 4, "time": 3 }, + { "index": 3, "time": 3 }, + { "index": 2, "time": 3 }, + { "index": 1, "time": 3 }, + { "index": 0, "time": 3 } + ] + } +} \ No newline at end of file