Skip to content

Commit

Permalink
Misc fixes lol
Browse files Browse the repository at this point in the history
Fixed:
 - #4502
 - #4465 (in a previous commit)
 - #4483 (Kinda, see todo in QButtonHandler for more details.)
 - #4467

 And other stuff idk I gotta head out
  • Loading branch information
Siuolplex committed Dec 16, 2023
1 parent 7335298 commit 09ba575
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Thumbs.db

## ForgeGradle
/run
/runServer

## eclipse
/.settings
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ minecraft {
}

server {
workingDirectory project.file('run')
workingDirectory project.file('runServer')
mods {
quark {
source sourceSets.main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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<GuiEventListener> listeners = event.getListenersList();
for(GuiEventListener b : listeners)
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
13 changes: 0 additions & 13 deletions src/main/resources/assets/quark/attribute_tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 09ba575

Please sign in to comment.