diff --git a/.gitignore b/.gitignore index b16cf099d2..760c032115 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ Thumbs.db ## ForgeGradle /run +/runServer ## eclipse /.settings diff --git a/build.gradle b/build.gradle index 0434c9df0d..41b4d2ab52 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ minecraft { } server { - workingDirectory project.file('run') + workingDirectory project.file('runServer') mods { quark { source sourceSets.main diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java b/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java index 4ed502c368..9aabb5c379 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java @@ -21,9 +21,11 @@ public static void onGuiInit(ZScreen.Init.Post event) { Screen gui = event.getScreen(); if(GeneralConfig.enableQButton && (gui instanceof TitleScreen || gui instanceof PauseScreen)) { + //todo: Player Reporting / Open to Lan occupy the same location depending on if its single or multiplayer + // Temporarily, Im setting it to be next to ReportBugs, but we will need to revisit it. ImmutableSet targets = GeneralConfig.qButtonOnRight ? ImmutableSet.of(I18n.get("fml.menu.modoptions"), I18n.get("menu.online")) - : ImmutableSet.of(I18n.get("menu.options"), I18n.get("fml.menu.mods")); + : ImmutableSet.of(I18n.get("menu.options"), I18n.get("menu.reportBugs")); List listeners = event.getListenersList(); for(GuiEventListener b : listeners) diff --git a/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java b/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java index a21a771df9..1111f39946 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java +++ b/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java @@ -245,6 +245,7 @@ public void start() { MinecraftForge.EVENT_BUS.addListener(this::livingFall); MinecraftForge.EVENT_BUS.addListener(this::wandererTrades); MinecraftForge.EVENT_BUS.addListener(this::furnaceFuelBurnTime); + MinecraftForge.EVENT_BUS.addListener(this::itemTooltip); } private boolean registerDone = false; @@ -521,6 +522,10 @@ public void furnaceFuelBurnTime(FurnaceFuelBurnTimeEvent e) { playBus.fire(new ForgeZFurnaceFuelBurnTime(e), ZFurnaceFuelBurnTime.class); } + public void itemTooltip(ItemTooltipEvent e) { + playBus.fire(new ForgeZItemTooltip(e), ZItemTooltip.class); + } + public static ZResult from(Event.Result r) { return switch(r) { case DENY -> ZResult.DENY; diff --git a/src/main/resources/assets/quark/attribute_tooltips.json b/src/main/resources/assets/quark/attribute_tooltips.json index 24647dcdbe..00d6a2ad21 100644 --- a/src/main/resources/assets/quark/attribute_tooltips.json +++ b/src/main/resources/assets/quark/attribute_tooltips.json @@ -155,19 +155,6 @@ "compare": "higher_better" }, "forge:entity_reach": { - "display": { - "mainhand": "difference", - "offhand": "difference", - "feet": "difference", - "legs": "difference", - "chest": "difference", - "head": "difference", - "potion": "difference" - }, - "texture": "quark:attribute/reach_distance", - "compare": "higher_better" - }, - "forge:attack_range": { "display": { "mainhand": "difference", "offhand": "difference", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 40fd2df6fa..5a2f7fb503 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -287,6 +287,9 @@ "quark:stone_lamp", "quark:stone_brick_lamp", "quark:duskbound_block", + "quark:duskbound_block_slab", + "quark:duskbound_block_stairs", + "quark:duskbound_block_vertical_slab", "quark:duskbound_lantern", "quark:gold_bars", "quark:iron_plate", diff --git a/src/main/resources/data/quark/tags/blocks/wooden_vertical_slabs.json b/src/main/resources/data/quark/tags/blocks/wooden_vertical_slabs.json index c4bf850669..49b9ff304d 100644 --- a/src/main/resources/data/quark/tags/blocks/wooden_vertical_slabs.json +++ b/src/main/resources/data/quark/tags/blocks/wooden_vertical_slabs.json @@ -9,6 +9,7 @@ "quark:dark_oak_vertical_slab", "quark:mangrove_vertical_slab", "quark:bamboo_vertical_slab", + "quark:bamboo_mosaic_vertical_slab", "quark:cherry_vertical_slab", "quark:crimson_vertical_slab", "quark:warped_vertical_slab",