From 9dbe5b78f226460511e961f082f4fcb491c21f4f Mon Sep 17 00:00:00 2001 From: Mysticpasta1 Date: Sun, 5 Mar 2023 22:17:26 -0600 Subject: [PATCH] Fixed Recipes and Advancements --- src/main/java/net/montoyo/wd/WebDisplays.java | 4 ++-- .../net/montoyo/wd/block/BlockScreen.java | 2 +- .../net/montoyo/wd/client/ClientProxy.java | 2 +- .../montoyo/wd/client/JSQueryDispatcher.java | 12 +++++----- .../net/montoyo/wd/core/CraftComponent.java | 16 ++++++------- .../net/montoyo/wd/core/DefaultUpgrade.java | 8 +++---- .../montoyo/wd/entity/TileEntityScreen.java | 4 ++-- .../montoyo/wd/item/ItemCraftComponent.java | 2 +- .../net/montoyo/wd/item/ItemMinePad2.java | 2 +- .../java/net/montoyo/wd/item/ItemUpgrade.java | 2 +- .../advancements/webdisplays/laser.json | 16 ------------- .../advancements/webdisplays/minepad.json | 21 ----------------- .../advancements/webdisplays/minepad2.json | 16 ------------- ...on_card.json => craftcomp_badextcard.json} | 0 ...ttery_cell.json => craftcomp_batcell.json} | 0 ...ttery_pack.json => craftcomp_batpack.json} | 0 ...nsion_card.json => craftcomp_extcard.json} | 0 ...r_diode.json => craftcomp_laserdiode.json} | 0 ...al_base.json => craftcomp_peripheral.json} | 0 ...stone_key.json => craftcomp_stonekey.json} | 0 ...nk_upgrade.json => craftcomp_upgrade.json} | 0 ...ser_mouse.json => upgrade_lasermouse.json} | 0 ...stone_input.json => upgrade_redinput.json} | 0 ...one_output.json => upgrade_redoutput.json} | 0 .../webdisplays/recipes/ccinterface.json | 20 ---------------- .../webdisplays/recipes/ocinterface.json | 20 ---------------- .../advancements}/keyboard_cat.json | 7 +++--- .../advancements}/link_peripheral.json | 5 ++-- .../webdisplays/advancements}/pad_break.json | 7 +++--- .../webdisplays/advancements}/root.json | 23 +++++++++++++++---- .../webdisplays/advancements}/screen.json | 14 +++++++---- .../webdisplays/advancements}/upgrade.json | 7 +++--- .../webdisplays/recipes/backlight.json | 2 +- .../webdisplays/recipes/batcell.json | 2 +- .../webdisplays/recipes/batpack.json | 4 ++-- .../webdisplays/recipes/extcard.json | 2 +- .../webdisplays/recipes/keyboard.json | 6 ++--- .../webdisplays/recipes/laserdiode.json | 2 +- .../webdisplays/recipes/laserpointer.json | 6 ++--- .../webdisplays/recipes/linker.json | 0 .../webdisplays/recipes/minepad.json | 8 +++---- .../webdisplays/recipes/minepad2.json | 0 .../webdisplays/recipes/peripheral.json | 5 ++-- .../webdisplays/recipes/rctrl.json | 6 ++--- .../webdisplays/recipes/redctrl1.json | 6 ++--- .../webdisplays/recipes/redctrl2.json | 4 ++-- .../webdisplays/recipes/screen.json | 8 +++---- .../webdisplays/recipes/screencfg.json | 0 .../webdisplays/recipes/server.json | 6 ++--- .../webdisplays/recipes/stonekey.json | 2 +- .../webdisplays/recipes/upgrade.json | 4 ++-- .../webdisplays/recipes/upgrade_gps.json | 4 ++-- .../webdisplays/recipes/upgrade_laser.json | 6 ++--- .../webdisplays/recipes/upgrade_redin.json | 4 ++-- .../webdisplays/recipes/upgrade_redout.json | 4 ++-- 55 files changed, 116 insertions(+), 185 deletions(-) delete mode 100644 src/main/resources/assets/webdisplays/advancements/webdisplays/laser.json delete mode 100644 src/main/resources/assets/webdisplays/advancements/webdisplays/minepad.json delete mode 100644 src/main/resources/assets/webdisplays/advancements/webdisplays/minepad2.json rename src/main/resources/assets/webdisplays/models/item/{craftcomp_bad_extension_card.json => craftcomp_badextcard.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_battery_cell.json => craftcomp_batcell.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_battery_pack.json => craftcomp_batpack.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_extension_card.json => craftcomp_extcard.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_laser_diode.json => craftcomp_laserdiode.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_peripheral_base.json => craftcomp_peripheral.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_stone_key.json => craftcomp_stonekey.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{craftcomp_blank_upgrade.json => craftcomp_upgrade.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{upgrade_laser_mouse.json => upgrade_lasermouse.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{upgrade_redstone_input.json => upgrade_redinput.json} (100%) rename src/main/resources/assets/webdisplays/models/item/{upgrade_redstone_output.json => upgrade_redoutput.json} (100%) delete mode 100644 src/main/resources/assets/webdisplays/recipes/ccinterface.json delete mode 100644 src/main/resources/assets/webdisplays/recipes/ocinterface.json rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/keyboard_cat.json (60%) rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/link_peripheral.json (79%) rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/pad_break.json (81%) rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/root.json (55%) rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/screen.json (76%) rename src/main/resources/{assets/webdisplays/advancements/webdisplays => data/webdisplays/advancements}/upgrade.json (66%) rename src/main/resources/{assets => data}/webdisplays/recipes/backlight.json (84%) rename src/main/resources/{assets => data}/webdisplays/recipes/batcell.json (87%) rename src/main/resources/{assets => data}/webdisplays/recipes/batpack.json (64%) rename src/main/resources/{assets => data}/webdisplays/recipes/extcard.json (91%) rename src/main/resources/{assets => data}/webdisplays/recipes/keyboard.json (62%) rename src/main/resources/{assets => data}/webdisplays/recipes/laserdiode.json (88%) rename src/main/resources/{assets => data}/webdisplays/recipes/laserpointer.json (66%) rename src/main/resources/{assets => data}/webdisplays/recipes/linker.json (100%) rename src/main/resources/{assets => data}/webdisplays/recipes/minepad.json (73%) rename src/main/resources/{assets => data}/webdisplays/recipes/minepad2.json (100%) rename src/main/resources/{assets => data}/webdisplays/recipes/peripheral.json (71%) rename src/main/resources/{assets => data}/webdisplays/recipes/rctrl.json (60%) rename src/main/resources/{assets => data}/webdisplays/recipes/redctrl1.json (66%) rename src/main/resources/{assets => data}/webdisplays/recipes/redctrl2.json (73%) rename src/main/resources/{assets => data}/webdisplays/recipes/screen.json (70%) rename src/main/resources/{assets => data}/webdisplays/recipes/screencfg.json (100%) rename src/main/resources/{assets => data}/webdisplays/recipes/server.json (60%) rename src/main/resources/{assets => data}/webdisplays/recipes/stonekey.json (80%) rename src/main/resources/{assets => data}/webdisplays/recipes/upgrade.json (72%) rename src/main/resources/{assets => data}/webdisplays/recipes/upgrade_gps.json (71%) rename src/main/resources/{assets => data}/webdisplays/recipes/upgrade_laser.json (57%) rename src/main/resources/{assets => data}/webdisplays/recipes/upgrade_redin.json (70%) rename src/main/resources/{assets => data}/webdisplays/recipes/upgrade_redout.json (70%) diff --git a/src/main/java/net/montoyo/wd/WebDisplays.java b/src/main/java/net/montoyo/wd/WebDisplays.java index 2bd1d8b..a127446 100644 --- a/src/main/java/net/montoyo/wd/WebDisplays.java +++ b/src/main/java/net/montoyo/wd/WebDisplays.java @@ -301,9 +301,9 @@ public class WebDisplays { @SubscribeEvent public void onPlayerCraft(PlayerEvent.ItemCraftedEvent ev) { - if(doHardRecipe && ev.getCrafting().getItem() == ItemInit.itemCraftComp.get() && (CraftComponent.EXTENSION_CARD.makeItemStack().is(ev.getCrafting().getItem()))) { + if(doHardRecipe && ev.getCrafting().getItem() == ItemInit.itemCraftComp.get() && (CraftComponent.EXTCARD.makeItemStack().is(ev.getCrafting().getItem()))) { if((ev.getEntity() instanceof ServerPlayer && !hasPlayerAdvancement((ServerPlayer) ev.getEntity(), ADV_PAD_BREAK)) || PROXY.hasClientPlayerAdvancement(ADV_PAD_BREAK) != HasAdvancement.YES) { - ev.getCrafting().setDamageValue(CraftComponent.BAD_EXTENSION_CARD.ordinal()); + ev.getCrafting().setDamageValue(CraftComponent.BADEXTCARD.ordinal()); if(!ev.getEntity().getLevel().isClientSide) ev.getEntity().getLevel().playSound(null, ev.getEntity().getX(), ev.getEntity().getY(), ev.getEntity().getZ(), SoundEvents.ITEM_BREAK, SoundSource.MASTER, 1.0f, 1.0f); diff --git a/src/main/java/net/montoyo/wd/block/BlockScreen.java b/src/main/java/net/montoyo/wd/block/BlockScreen.java index d7b5723..b1b862b 100644 --- a/src/main/java/net/montoyo/wd/block/BlockScreen.java +++ b/src/main/java/net/montoyo/wd/block/BlockScreen.java @@ -228,7 +228,7 @@ public class BlockScreen extends BaseEntityBlock { Multiblock.findOrigin(world, vec, side, null); TileEntityScreen tes = (TileEntityScreen) world.getBlockEntity(vec.toBlock()); - if(tes != null && tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_INPUT)) { + if(tes != null && tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) { Direction facing = Direction.from2DDataValue(side.reverse().ordinal()); //Opposite face vec.sub(pos.getX(), pos.getY(), pos.getZ()).neg(); tes.updateJSRedstone(side, new Vector2i(vec.dot(side.right), vec.dot(side.up)), world.getSignal(pos, facing)); diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 9b31bf5..0f7b25a 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -610,7 +610,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer Multiblock.findOrigin(mc.level, pos, side, null); TileEntityScreen te = (TileEntityScreen) mc.level.getBlockEntity(pos.toBlock()); - if(te != null && te.hasUpgrade(side, DefaultUpgrade.LASER_MOUSE)) { //hasUpgrade returns false is there's no screen on side 'side' + if(te != null && te.hasUpgrade(side, DefaultUpgrade.LASERMOUSE)) { //hasUpgrade returns false is there's no screen on side 'side' //Since rights aren't synchronized, let the server check them for us... TileEntityScreen.Screen scr = te.getScreen(side); diff --git a/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java b/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java index 14ca8a7..b99f762 100644 --- a/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java +++ b/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java @@ -225,7 +225,7 @@ public final class JSQueryDispatcher { }); register("GetRedstoneAt", (cb, tes, side, args) -> { - if(!tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_INPUT)) { + if(!tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) { cb.failure(403, "Missing upgrade"); return; } @@ -247,7 +247,7 @@ public final class JSQueryDispatcher { }); register("GetRedstoneArray", (cb, tes, side, args) -> { - if(tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_INPUT)) { + if(tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) { final Direction facing = Direction.values()[side.reverse().ordinal()]; final StringJoiner resp = new StringJoiner(",", "{\"levels\":[", "]}"); @@ -264,7 +264,7 @@ public final class JSQueryDispatcher { }); register("ClearRedstone", (cb, tes, side, args) -> { - if(tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_OUTPUT)) { + if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) { if(tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId())) makeServerQuery(tes, side, cb, JSServerRequest.CLEAR_REDSTONE); else @@ -279,7 +279,7 @@ public final class JSQueryDispatcher { return; } - if(!tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_OUTPUT)) { + if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) { cb.failure(403, "Missing upgrade"); return; } @@ -303,7 +303,7 @@ public final class JSQueryDispatcher { }); register("IsEmitting", (cb, tes, side, args) -> { - if(!tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_OUTPUT)) { + if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) { cb.failure(403, "Missing upgrade"); return; } @@ -325,7 +325,7 @@ public final class JSQueryDispatcher { }); register("GetEmissionArray", (cb, tes, side, args) -> { - if(tes.hasUpgrade(side, DefaultUpgrade.REDSTONE_OUTPUT)) { + if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) { final StringJoiner resp = new StringJoiner(",", "{\"emission\":[", "]}"); tes.forEachScreenBlocks(side, bp -> resp.add(tes.getLevel().getBlockState(bp).getValue(BlockScreen.emitting) ? "1" : "0")); cb.success(resp.toString()); diff --git a/src/main/java/net/montoyo/wd/core/CraftComponent.java b/src/main/java/net/montoyo/wd/core/CraftComponent.java index f5aab8e..8ad332f 100644 --- a/src/main/java/net/montoyo/wd/core/CraftComponent.java +++ b/src/main/java/net/montoyo/wd/core/CraftComponent.java @@ -10,15 +10,15 @@ import net.montoyo.wd.init.ItemInit; public enum CraftComponent { - STONE_KEY("stonekey", "Stone_Key"), - BLANK_UPGRADE("upgrade", "Blank_Upgrade"), - PERIPHERAL_BASE("peripheral", "Peripheral_Base"), - BATTERY_CELL("batcell", "Battery_Cell"), - BATTERY_PACK("batpack", "Battery_Pack"), - LASER_DIODE("laserdiode", "Laser_Diode"), + STONEKEY("stonekey", "StoneKey"), + UPGRADE("upgrade", "Upgrade"), + PERIPHERAL("peripheral", "Peripheral"), + BATCELL("batcell", "BatCell"), + BATPACK("batpack", "BatPack"), + LASERDIODE("laserdiode", "LaserDiode"), BACKLIGHT("backlight", "Backlight"), - EXTENSION_CARD("extcard", "Blank_Upgrade"), - BAD_EXTENSION_CARD("badextcard", "Bad_Extension_Card"); + EXTCARD("extcard", "ExtCard"), + BADEXTCARD("badextcard", "BadExtCard"); private final String name; private final String wikiName; diff --git a/src/main/java/net/montoyo/wd/core/DefaultUpgrade.java b/src/main/java/net/montoyo/wd/core/DefaultUpgrade.java index 36c6308..064d082 100644 --- a/src/main/java/net/montoyo/wd/core/DefaultUpgrade.java +++ b/src/main/java/net/montoyo/wd/core/DefaultUpgrade.java @@ -11,10 +11,10 @@ import net.montoyo.wd.init.ItemInit; public enum DefaultUpgrade { - LASER_MOUSE("lasermouse", "Laser_Sensor"), - REDSTONE_INPUT("redinput", "Redstone_Input_Port"), - REDSTONE_OUTPUT("redoutput", "Redstone_Output_Port"), - GPS("gps", "GPS_Module"); + LASERMOUSE("lasermouse", "LaserMouse"), + REDINPUT("redinput", "RedInput"), + REDOUTPUT("redoutput", "RedOutput"), + GPS("gps", "GPS"); private final String name; private final String wikiName; diff --git a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java index 1638b84..034aad2 100644 --- a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java +++ b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java @@ -564,7 +564,7 @@ public class TileEntityScreen extends BlockEntity{ return; } - if(scr.upgrades.stream().noneMatch(DefaultUpgrade.REDSTONE_OUTPUT::matches)) { + if(scr.upgrades.stream().noneMatch(DefaultUpgrade.REDOUTPUT::matches)) { Messages.INSTANCE.send(PacketDistributor.PLAYER.with(() -> src), new CMessageJSResponse(reqId, req, 403, "Missing upgrade")); return; } @@ -957,7 +957,7 @@ public class TileEntityScreen extends BlockEntity{ if((scr.rightsFor(ply) & ScreenRights.CLICK) == 0) return null; //Don't output an error, it can 'legally' happen - if(scr.upgrades.stream().noneMatch(DefaultUpgrade.LASER_MOUSE::matches)) { + if(scr.upgrades.stream().noneMatch(DefaultUpgrade.LASERMOUSE::matches)) { Log.error("Called laser operation on side %s, but it's missing the laser sensor upgrade", side.toString()); return null; } diff --git a/src/main/java/net/montoyo/wd/item/ItemCraftComponent.java b/src/main/java/net/montoyo/wd/item/ItemCraftComponent.java index 23b577b..7ad1e3c 100644 --- a/src/main/java/net/montoyo/wd/item/ItemCraftComponent.java +++ b/src/main/java/net/montoyo/wd/item/ItemCraftComponent.java @@ -17,7 +17,7 @@ public class ItemCraftComponent extends ItemMulti implements WDItem { .tab(WebDisplays.CREATIVE_TAB)); //Hide the bad extension card from the creative tab - creativeTabItems.clear(CraftComponent.BAD_EXTENSION_CARD.ordinal()); + creativeTabItems.clear(CraftComponent.BADEXTCARD.ordinal()); } @Override diff --git a/src/main/java/net/montoyo/wd/item/ItemMinePad2.java b/src/main/java/net/montoyo/wd/item/ItemMinePad2.java index 79ca039..3801d3a 100644 --- a/src/main/java/net/montoyo/wd/item/ItemMinePad2.java +++ b/src/main/java/net/montoyo/wd/item/ItemMinePad2.java @@ -87,7 +87,7 @@ public class ItemMinePad2 extends Item implements WDItem { if(thrower != null && height - ent.getBlockY() >= 20.0) { ent.getLevel().playSound(null, ent.getBlockX(), ent.getBlockY(), ent.getBlockZ(), SoundEvents.GLASS_BREAK, SoundSource.BLOCKS, 4.0f, 1.0f); - ent.getLevel().addFreshEntity(new ItemEntity(ent.getLevel(), ent.getBlockX(), ent.getBlockY(), ent.getBlockZ(), CraftComponent.EXTENSION_CARD.makeItemStack())); + ent.getLevel().addFreshEntity(new ItemEntity(ent.getLevel(), ent.getBlockX(), ent.getBlockY(), ent.getBlockZ(), CraftComponent.EXTCARD.makeItemStack())); ent.setRemoved(Entity.RemovalReason.CHANGED_DIMENSION); Player ply = ent.getLevel().getPlayerByUUID(thrower); diff --git a/src/main/java/net/montoyo/wd/item/ItemUpgrade.java b/src/main/java/net/montoyo/wd/item/ItemUpgrade.java index 069c0e0..3c04184 100644 --- a/src/main/java/net/montoyo/wd/item/ItemUpgrade.java +++ b/src/main/java/net/montoyo/wd/item/ItemUpgrade.java @@ -28,7 +28,7 @@ public class ItemUpgrade extends ItemMulti implements IUpgrade, WDItem { @Override public boolean onRemove(@Nonnull TileEntityScreen tes, @Nonnull BlockSide screenSide, @Nullable Player player, @Nonnull ItemStack is) { - if(DefaultUpgrade.LASER_MOUSE.matches(is)) + if(DefaultUpgrade.LASERMOUSE.matches(is)) tes.clearLaserUser(screenSide); return false; diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/laser.json b/src/main/resources/assets/webdisplays/advancements/webdisplays/laser.json deleted file mode 100644 index 145aff7..0000000 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/laser.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "display": { - "icon": { "item": "webdisplays:laserpointer" }, - "title": { "translate": "advancements.webdisplays.laser.title" }, - "description": { "translate": "advancements.webdisplays.laser.description" } - }, - "parent": "webdisplays:webdisplays/pad_break", - "criteria": { - "has_laser": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "webdisplays:laserpointer" } ] - } - } - } -} diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad.json b/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad.json deleted file mode 100644 index 4b5001a..0000000 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "display": { - "icon": { "item": "webdisplays:minepad" }, - "title": { "translate": "advancements.webdisplays.minepad.title" }, - "description": { "translate": "advancements.webdisplays.minepad.description" } - }, - "parent": "webdisplays:webdisplays/root", - "criteria": { - "has_glass_pane": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "webdisplays:minepad", "data": 0 } ] - } - } - }, - "rewards": { - "recipes": [ - "webdisplays:minepad2" - ] - } -} diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad2.json b/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad2.json deleted file mode 100644 index 99d69a7..0000000 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/minepad2.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "display": { - "icon": { "item": "webdisplays:advicon", "data": 2 }, - "title": { "translate": "advancements.webdisplays.minepad2.title" }, - "description": { "translate": "advancements.webdisplays.minepad2.description" } - }, - "parent": "webdisplays:webdisplays/minepad", - "criteria": { - "has_minepad2": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "webdisplays:minepad", "data": 1 } ] - } - } - } -} diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_bad_extension_card.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_bad_extension_card.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_battery_cell.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_battery_cell.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_battery_pack.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_battery_pack.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_extension_card.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_extension_card.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_laser_diode.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_laser_diode.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral_base.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral_base.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_stone_key.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_stone_key.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_blank_upgrade.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/craftcomp_blank_upgrade.json rename to src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_laser_mouse.json b/src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/upgrade_laser_mouse.json rename to src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_redstone_input.json b/src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/upgrade_redstone_input.json rename to src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_redstone_output.json b/src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/item/upgrade_redstone_output.json rename to src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json diff --git a/src/main/resources/assets/webdisplays/recipes/ccinterface.json b/src/main/resources/assets/webdisplays/recipes/ccinterface.json deleted file mode 100644 index f335e8b..0000000 --- a/src/main/resources/assets/webdisplays/recipes/ccinterface.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PC" - ], - "key": { - "C": { - "item": "minecraft:dye", - "data": 6 - }, - "P": { - "item": "webdisplays:craftcomp", - "data": 2 - } - }, - "result": { - "item": "webdisplays:peripheral", - "data": 1 - } -} diff --git a/src/main/resources/assets/webdisplays/recipes/ocinterface.json b/src/main/resources/assets/webdisplays/recipes/ocinterface.json deleted file mode 100644 index 4281eb6..0000000 --- a/src/main/resources/assets/webdisplays/recipes/ocinterface.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PG" - ], - "key": { - "G": { - "item": "minecraft:dye", - "data": 8 - }, - "P": { - "item": "webdisplays:craftcomp", - "data": 2 - } - }, - "result": { - "item": "webdisplays:peripheral", - "data": 2 - } -} diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/keyboard_cat.json b/src/main/resources/data/webdisplays/advancements/keyboard_cat.json similarity index 60% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/keyboard_cat.json rename to src/main/resources/data/webdisplays/advancements/keyboard_cat.json index 08d2421..610b9d1 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/keyboard_cat.json +++ b/src/main/resources/data/webdisplays/advancements/keyboard_cat.json @@ -1,10 +1,11 @@ { "display": { - "icon": { "item": "minecraft:skull", "data": 3, "nbt": "{SkullOwner:\"MHF_Ocelot\"}" }, + "icon": { "item": "minecraft:string" }, "title": { "translate": "advancements.webdisplays.keyboardcat.title" }, - "description": { "translate": "advancements.webdisplays.keyboardcat.description" } + "description": { "translate": "advancements.webdisplays.keyboardcat.description" }, + "frame": "task" }, - "parent": "webdisplays:webdisplays/link_peripheral", + "parent": "webdisplays:link_peripheral", "criteria": { "keyboard_cat": { "trigger": "webdisplays:keyboard_cat" diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/link_peripheral.json b/src/main/resources/data/webdisplays/advancements/link_peripheral.json similarity index 79% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/link_peripheral.json rename to src/main/resources/data/webdisplays/advancements/link_peripheral.json index c5deb06..c46d5fa 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/link_peripheral.json +++ b/src/main/resources/data/webdisplays/advancements/link_peripheral.json @@ -2,9 +2,10 @@ "display": { "icon": { "item": "webdisplays:linker" }, "title": { "translate": "advancements.webdisplays.linkperipheral.title" }, - "description": { "translate": "advancements.webdisplays.linkperipheral.description" } + "description": { "translate": "advancements.webdisplays.linkperipheral.description" }, + "frame": "task" }, - "parent": "webdisplays:webdisplays/screen", + "parent": "webdisplays:screen", "criteria": { "link_peripheral": { "trigger": "webdisplays:link_peripheral" diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/pad_break.json b/src/main/resources/data/webdisplays/advancements/pad_break.json similarity index 81% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/pad_break.json rename to src/main/resources/data/webdisplays/advancements/pad_break.json index f7f1b09..2db7fea 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/pad_break.json +++ b/src/main/resources/data/webdisplays/advancements/pad_break.json @@ -1,10 +1,11 @@ { "display": { - "icon": { "item": "webdisplays:advicon", "data": 1 }, + "icon": { "item": "webdisplays:minepad" }, "title": { "translate": "advancements.webdisplays.padbreak.title" }, - "description": { "translate": "advancements.webdisplays.padbreak.description" } + "description": { "translate": "advancements.webdisplays.padbreak.description" }, + "frame": "task" }, - "parent": "webdisplays:webdisplays/minepad", + "parent": "webdisplays:root", "criteria": { "pad_break": { "trigger": "webdisplays:pad_break" diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/root.json b/src/main/resources/data/webdisplays/advancements/root.json similarity index 55% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/root.json rename to src/main/resources/data/webdisplays/advancements/root.json index 03d5191..1c8ed3f 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/root.json +++ b/src/main/resources/data/webdisplays/advancements/root.json @@ -1,9 +1,16 @@ { "display": { - "icon": { "item": "webdisplays:advicon", "data": 0 }, - "title": { "translate": "advancements.webdisplays.root.title" }, - "description": { "translate": "advancements.webdisplays.root.description" }, + "icon": { + "item": "minecraft:glass_pane" + }, + "title": { + "translate": "advancements.webdisplays.root.title" + }, + "description": { + "translate": "advancements.webdisplays.root.description" + }, "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", + "frame": "task", "show_toast": false, "announce_to_chat": false }, @@ -11,7 +18,13 @@ "has_glass_pane": { "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ { "item": "minecraft:glass_pane" } ] + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] } } }, @@ -25,3 +38,5 @@ ] } } + + diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/screen.json b/src/main/resources/data/webdisplays/advancements/screen.json similarity index 76% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/screen.json rename to src/main/resources/data/webdisplays/advancements/screen.json index 20149a2..8679929 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/screen.json +++ b/src/main/resources/data/webdisplays/advancements/screen.json @@ -2,14 +2,21 @@ "display": { "icon": { "item": "webdisplays:screen" }, "title": { "translate": "advancements.webdisplays.screen.title" }, - "description": { "translate": "advancements.webdisplays.screen.description" } + "description": { "translate": "advancements.webdisplays.screen.description" }, + "frame": "task" }, - "parent": "webdisplays:webdisplays/root", + "parent": "webdisplays:root", "criteria": { "has_screen": { "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ { "item": "webdisplays:screen" } ] + "items": [ + { + "items": [ + "webdisplays:screen" + ] + } + ] } } }, @@ -19,7 +26,6 @@ "webdisplays:screencfg", "webdisplays:peripheral", "webdisplays:rctrl", - "webdisplays:ocinterface", "webdisplays:redctrl1", "webdisplays:redctrl2", "webdisplays:stonekey", diff --git a/src/main/resources/assets/webdisplays/advancements/webdisplays/upgrade.json b/src/main/resources/data/webdisplays/advancements/upgrade.json similarity index 66% rename from src/main/resources/assets/webdisplays/advancements/webdisplays/upgrade.json rename to src/main/resources/data/webdisplays/advancements/upgrade.json index a1eb239..ae2c5af 100644 --- a/src/main/resources/assets/webdisplays/advancements/webdisplays/upgrade.json +++ b/src/main/resources/data/webdisplays/advancements/upgrade.json @@ -1,10 +1,11 @@ { "display": { - "icon": { "item": "webdisplays:craftcomp", "data": 1 }, + "icon": { "item": "webdisplays:screen" }, "title": { "translate": "advancements.webdisplays.upgrade.title" }, - "description": { "translate": "advancements.webdisplays.upgrade.description" } + "description": { "translate": "advancements.webdisplays.upgrade.description" }, + "frame": "task" }, - "parent": "webdisplays:webdisplays/pad_break", + "parent": "webdisplays:pad_break", "criteria": { "upgrade_screen": { "trigger": "webdisplays:upgrade_screen" diff --git a/src/main/resources/assets/webdisplays/recipes/backlight.json b/src/main/resources/data/webdisplays/recipes/backlight.json similarity index 84% rename from src/main/resources/assets/webdisplays/recipes/backlight.json rename to src/main/resources/data/webdisplays/recipes/backlight.json index 8db28d9..ee9f266 100644 --- a/src/main/resources/assets/webdisplays/recipes/backlight.json +++ b/src/main/resources/data/webdisplays/recipes/backlight.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_backlight", "data": 6, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/batcell.json b/src/main/resources/data/webdisplays/recipes/batcell.json similarity index 87% rename from src/main/resources/assets/webdisplays/recipes/batcell.json rename to src/main/resources/data/webdisplays/recipes/batcell.json index 59978aa..e2ce2c7 100644 --- a/src/main/resources/assets/webdisplays/recipes/batcell.json +++ b/src/main/resources/data/webdisplays/recipes/batcell.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_batcell", "data": 3, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/batpack.json b/src/main/resources/data/webdisplays/recipes/batpack.json similarity index 64% rename from src/main/resources/assets/webdisplays/recipes/batpack.json rename to src/main/resources/data/webdisplays/recipes/batpack.json index 084aaa2..2a802dc 100644 --- a/src/main/resources/assets/webdisplays/recipes/batpack.json +++ b/src/main/resources/data/webdisplays/recipes/batpack.json @@ -3,12 +3,12 @@ "pattern": [ "BBB" ], "key": { "B": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_batcell", "data": 3 } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_batpack", "data": 4, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/extcard.json b/src/main/resources/data/webdisplays/recipes/extcard.json similarity index 91% rename from src/main/resources/assets/webdisplays/recipes/extcard.json rename to src/main/resources/data/webdisplays/recipes/extcard.json index 290b0f8..30e504d 100644 --- a/src/main/resources/assets/webdisplays/recipes/extcard.json +++ b/src/main/resources/data/webdisplays/recipes/extcard.json @@ -25,7 +25,7 @@ } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_extcard", "data": 7 } } diff --git a/src/main/resources/assets/webdisplays/recipes/keyboard.json b/src/main/resources/data/webdisplays/recipes/keyboard.json similarity index 62% rename from src/main/resources/assets/webdisplays/recipes/keyboard.json rename to src/main/resources/data/webdisplays/recipes/keyboard.json index 30bc9b0..23c51c7 100644 --- a/src/main/resources/assets/webdisplays/recipes/keyboard.json +++ b/src/main/resources/data/webdisplays/recipes/keyboard.json @@ -7,16 +7,16 @@ ], "key": { "K": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_stonekey", "data": 0 }, "P": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_peripheral", "data": 2 } }, "result": { - "item": "webdisplays:peripheral", + "item": "webdisplays:keyboard", "data": 0, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/laserdiode.json b/src/main/resources/data/webdisplays/recipes/laserdiode.json similarity index 88% rename from src/main/resources/assets/webdisplays/recipes/laserdiode.json rename to src/main/resources/data/webdisplays/recipes/laserdiode.json index 625d88f..42a3a13 100644 --- a/src/main/resources/assets/webdisplays/recipes/laserdiode.json +++ b/src/main/resources/data/webdisplays/recipes/laserdiode.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_laserdiode", "data": 5, "count": 2 } diff --git a/src/main/resources/assets/webdisplays/recipes/laserpointer.json b/src/main/resources/data/webdisplays/recipes/laserpointer.json similarity index 66% rename from src/main/resources/assets/webdisplays/recipes/laserpointer.json rename to src/main/resources/data/webdisplays/recipes/laserpointer.json index 7953d91..5282e11 100644 --- a/src/main/resources/assets/webdisplays/recipes/laserpointer.json +++ b/src/main/resources/data/webdisplays/recipes/laserpointer.json @@ -7,15 +7,15 @@ ], "key": { "D": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_laserdiode", "data": 5 }, "C": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_batcell", "data": 3 }, "B": { - "item": "minecraft:wooden_button" + "item": "minecraft:oak_button" } }, "result": { diff --git a/src/main/resources/assets/webdisplays/recipes/linker.json b/src/main/resources/data/webdisplays/recipes/linker.json similarity index 100% rename from src/main/resources/assets/webdisplays/recipes/linker.json rename to src/main/resources/data/webdisplays/recipes/linker.json diff --git a/src/main/resources/assets/webdisplays/recipes/minepad.json b/src/main/resources/data/webdisplays/recipes/minepad.json similarity index 73% rename from src/main/resources/assets/webdisplays/recipes/minepad.json rename to src/main/resources/data/webdisplays/recipes/minepad.json index 1d8aff5..cb98938 100644 --- a/src/main/resources/assets/webdisplays/recipes/minepad.json +++ b/src/main/resources/data/webdisplays/recipes/minepad.json @@ -10,22 +10,22 @@ "item": "minecraft:glass_pane" }, "R": { - "item": "minecraft:dye", + "item": "minecraft:red_dye", "data": 1 }, "G": { - "item": "minecraft:dye", + "item": "minecraft:green_dye", "data": 2 }, "B": { - "item": "minecraft:dye", + "item": "minecraft:blue_dye", "data": 4 }, "D": { "item": "minecraft:diamond" }, "C": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_batcell", "data": 4 } }, diff --git a/src/main/resources/assets/webdisplays/recipes/minepad2.json b/src/main/resources/data/webdisplays/recipes/minepad2.json similarity index 100% rename from src/main/resources/assets/webdisplays/recipes/minepad2.json rename to src/main/resources/data/webdisplays/recipes/minepad2.json diff --git a/src/main/resources/assets/webdisplays/recipes/peripheral.json b/src/main/resources/data/webdisplays/recipes/peripheral.json similarity index 71% rename from src/main/resources/assets/webdisplays/recipes/peripheral.json rename to src/main/resources/data/webdisplays/recipes/peripheral.json index 91681ec..19759d5 100644 --- a/src/main/resources/assets/webdisplays/recipes/peripheral.json +++ b/src/main/resources/data/webdisplays/recipes/peripheral.json @@ -7,15 +7,14 @@ ], "key": { "S": { - "item": "minecraft:wooden_slab", - "data": 0 + "item": "minecraft:oak_slab" }, "T": { "item": "minecraft:redstone_torch" } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_peripheral", "data": 2, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/rctrl.json b/src/main/resources/data/webdisplays/recipes/rctrl.json similarity index 60% rename from src/main/resources/assets/webdisplays/recipes/rctrl.json rename to src/main/resources/data/webdisplays/recipes/rctrl.json index fa4d1ab..f101dd3 100644 --- a/src/main/resources/assets/webdisplays/recipes/rctrl.json +++ b/src/main/resources/data/webdisplays/recipes/rctrl.json @@ -6,15 +6,15 @@ ], "key": { "P": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_peripheral", "data": 2 }, "B": { - "item": "minecraft:wooden_button" + "item": "minecraft:oak_button" } }, "result": { - "item": "webdisplays:peripheral", + "item": "webdisplays:rctrl", "data": 3 } } diff --git a/src/main/resources/assets/webdisplays/recipes/redctrl1.json b/src/main/resources/data/webdisplays/recipes/redctrl1.json similarity index 66% rename from src/main/resources/assets/webdisplays/recipes/redctrl1.json rename to src/main/resources/data/webdisplays/recipes/redctrl1.json index a8914ae..b08cdcc 100644 --- a/src/main/resources/assets/webdisplays/recipes/redctrl1.json +++ b/src/main/resources/data/webdisplays/recipes/redctrl1.json @@ -10,15 +10,15 @@ "item": "minecraft:redstone" }, "P": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_peripheral", "data": 2 }, "B": { - "item": "minecraft:wooden_button" + "item": "minecraft:oak_button" } }, "result": { - "item": "webdisplays:peripheral", + "item": "webdisplays:redctrl", "data": 7 } } diff --git a/src/main/resources/assets/webdisplays/recipes/redctrl2.json b/src/main/resources/data/webdisplays/recipes/redctrl2.json similarity index 73% rename from src/main/resources/assets/webdisplays/recipes/redctrl2.json rename to src/main/resources/data/webdisplays/recipes/redctrl2.json index 11ea2c1..6007c33 100644 --- a/src/main/resources/assets/webdisplays/recipes/redctrl2.json +++ b/src/main/resources/data/webdisplays/recipes/redctrl2.json @@ -9,12 +9,12 @@ "item": "minecraft:redstone" }, "P": { - "item": "webdisplays:peripheral", + "item": "webdisplays:redctrl", "data": 3 } }, "result": { - "item": "webdisplays:peripheral", + "item": "webdisplays:redctrl", "data": 7 } } diff --git a/src/main/resources/assets/webdisplays/recipes/screen.json b/src/main/resources/data/webdisplays/recipes/screen.json similarity index 70% rename from src/main/resources/assets/webdisplays/recipes/screen.json rename to src/main/resources/data/webdisplays/recipes/screen.json index 53373cf..755ca26 100644 --- a/src/main/resources/assets/webdisplays/recipes/screen.json +++ b/src/main/resources/data/webdisplays/recipes/screen.json @@ -10,19 +10,19 @@ "item": "minecraft:glass_pane" }, "R": { - "item": "minecraft:dye", + "item": "minecraft:red_dye", "data": 1 }, "G": { - "item": "minecraft:dye", + "item": "minecraft:green_dye", "data": 2 }, "B": { - "item": "minecraft:dye", + "item": "minecraft:blue_dye", "data": 4 }, "L": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_backlight", "data": 6 } }, diff --git a/src/main/resources/assets/webdisplays/recipes/screencfg.json b/src/main/resources/data/webdisplays/recipes/screencfg.json similarity index 100% rename from src/main/resources/assets/webdisplays/recipes/screencfg.json rename to src/main/resources/data/webdisplays/recipes/screencfg.json diff --git a/src/main/resources/assets/webdisplays/recipes/server.json b/src/main/resources/data/webdisplays/recipes/server.json similarity index 60% rename from src/main/resources/assets/webdisplays/recipes/server.json rename to src/main/resources/data/webdisplays/recipes/server.json index e837004..741ee3c 100644 --- a/src/main/resources/assets/webdisplays/recipes/server.json +++ b/src/main/resources/data/webdisplays/recipes/server.json @@ -5,16 +5,16 @@ ], "key": { "G": { - "item": "minecraft:dye", + "item": "minecraft:green_dye", "data": 2 }, "P": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_peripheral", "data": 2 } }, "result": { - "item": "webdisplays:peripheral", + "item": "webdisplays:server", "data": 11 } } diff --git a/src/main/resources/assets/webdisplays/recipes/stonekey.json b/src/main/resources/data/webdisplays/recipes/stonekey.json similarity index 80% rename from src/main/resources/assets/webdisplays/recipes/stonekey.json rename to src/main/resources/data/webdisplays/recipes/stonekey.json index d6f0831..b1ca551 100644 --- a/src/main/resources/assets/webdisplays/recipes/stonekey.json +++ b/src/main/resources/data/webdisplays/recipes/stonekey.json @@ -7,7 +7,7 @@ } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_stonekey", "data": 0, "count": 9 } diff --git a/src/main/resources/assets/webdisplays/recipes/upgrade.json b/src/main/resources/data/webdisplays/recipes/upgrade.json similarity index 72% rename from src/main/resources/assets/webdisplays/recipes/upgrade.json rename to src/main/resources/data/webdisplays/recipes/upgrade.json index 5b804e9..6bc002e 100644 --- a/src/main/resources/assets/webdisplays/recipes/upgrade.json +++ b/src/main/resources/data/webdisplays/recipes/upgrade.json @@ -10,12 +10,12 @@ "item": "minecraft:quartz" }, "E": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_extcard", "data": 7 } }, "result": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_upgrade", "data": 1, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/upgrade_gps.json b/src/main/resources/data/webdisplays/recipes/upgrade_gps.json similarity index 71% rename from src/main/resources/assets/webdisplays/recipes/upgrade_gps.json rename to src/main/resources/data/webdisplays/recipes/upgrade_gps.json index 32e0dfb..c30bbc7 100644 --- a/src/main/resources/assets/webdisplays/recipes/upgrade_gps.json +++ b/src/main/resources/data/webdisplays/recipes/upgrade_gps.json @@ -3,7 +3,7 @@ "pattern": [ "UE" ], "key": { "U": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_upgrade", "data": 1 }, "E": { @@ -11,7 +11,7 @@ } }, "result": { - "item": "webdisplays:upgrade", + "item": "webdisplays:upgrade_gps", "data": 3, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/upgrade_laser.json b/src/main/resources/data/webdisplays/recipes/upgrade_laser.json similarity index 57% rename from src/main/resources/assets/webdisplays/recipes/upgrade_laser.json rename to src/main/resources/data/webdisplays/recipes/upgrade_laser.json index 54e9882..201dd87 100644 --- a/src/main/resources/assets/webdisplays/recipes/upgrade_laser.json +++ b/src/main/resources/data/webdisplays/recipes/upgrade_laser.json @@ -3,16 +3,16 @@ "pattern": [ "UL" ], "key": { "U": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_upgrade", "data": 1 }, "L": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_laserdiode", "data": 5 } }, "result": { - "item": "webdisplays:upgrade", + "item": "webdisplays:upgrade_lasermouse", "data": 0, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/upgrade_redin.json b/src/main/resources/data/webdisplays/recipes/upgrade_redin.json similarity index 70% rename from src/main/resources/assets/webdisplays/recipes/upgrade_redin.json rename to src/main/resources/data/webdisplays/recipes/upgrade_redin.json index a86225f..6b1ebbd 100644 --- a/src/main/resources/assets/webdisplays/recipes/upgrade_redin.json +++ b/src/main/resources/data/webdisplays/recipes/upgrade_redin.json @@ -3,7 +3,7 @@ "pattern": [ "UR" ], "key": { "U": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_upgrade", "data": 1 }, "R": { @@ -11,7 +11,7 @@ } }, "result": { - "item": "webdisplays:upgrade", + "item": "webdisplays:upgrade_redinput", "data": 1, "count": 1 } diff --git a/src/main/resources/assets/webdisplays/recipes/upgrade_redout.json b/src/main/resources/data/webdisplays/recipes/upgrade_redout.json similarity index 70% rename from src/main/resources/assets/webdisplays/recipes/upgrade_redout.json rename to src/main/resources/data/webdisplays/recipes/upgrade_redout.json index 19a0443..a25dd35 100644 --- a/src/main/resources/assets/webdisplays/recipes/upgrade_redout.json +++ b/src/main/resources/data/webdisplays/recipes/upgrade_redout.json @@ -3,7 +3,7 @@ "pattern": [ "UR" ], "key": { "U": { - "item": "webdisplays:craftcomp", + "item": "webdisplays:craftcomp_upgrade", "data": 1 }, "R": { @@ -11,7 +11,7 @@ } }, "result": { - "item": "webdisplays:upgrade", + "item": "webdisplays:upgrade_redoutput", "data": 2, "count": 1 }