imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-04-02 05:27:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix client events, bump version to 1.1, fix FluidStackHooks for fabric.

Browse Source
This commit is contained in:
shedaniel
2020-11-22 19:35:39 +08:00
parent 427f365850
commit eaba509f2b
21 changed files with 437 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge/src/main/java/me/shedaniel/architectury/event/forge/EventHandlerImplClient.java
View File

@@ -21,17 +21,19 @@ package me.shedaniel.architectury.event.forge;
import me.shedaniel.architectury.event.events.TextureStitchEvent;
import me.shedaniel.architectury.event.events.*;
import me.shedaniel.architectury.event.events.client.ClientChatEvent;
import me.shedaniel.architectury.event.events.client.ClientLifecycleEvent;
import me.shedaniel.architectury.event.events.client.ClientPlayerEvent;
import me.shedaniel.architectury.event.events.client.ClientTickEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.IGuiEventListener;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.network.play.server.SUpdateRecipesPacket;
import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.*;
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.WorldEvent;
@@ -47,11 +49,11 @@ public class EventHandlerImplClient {
}
@SubscribeEvent
public static void event(ClientTickEvent event) {
public static void event(net.minecraftforge.event.TickEvent.ClientTickEvent event) {
if (event.phase == net.minecraftforge.event.TickEvent.Phase.START)
TickEvent.CLIENT_PRE.invoker().tick(Minecraft.getInstance());
ClientTickEvent.CLIENT_PRE.invoker().tick(Minecraft.getInstance());
else if (event.phase == net.minecraftforge.event.TickEvent.Phase.END)
TickEvent.CLIENT_POST.invoker().tick(Minecraft.getInstance());
ClientTickEvent.CLIENT_POST.invoker().tick(Minecraft.getInstance());
}
@SubscribeEvent
@@ -62,17 +64,17 @@ public class EventHandlerImplClient {
@SubscribeEvent
public static void event(ClientPlayerNetworkEvent.LoggedInEvent event) {
PlayerEvent.CLIENT_PLAYER_JOIN.invoker().join(event.getPlayer());
ClientPlayerEvent.CLIENT_PLAYER_JOIN.invoker().join(event.getPlayer());
}
@SubscribeEvent
public static void event(ClientPlayerNetworkEvent.LoggedOutEvent event) {
PlayerEvent.CLIENT_PLAYER_QUIT.invoker().quit(event.getPlayer());
ClientPlayerEvent.CLIENT_PLAYER_QUIT.invoker().quit(event.getPlayer());
}
@SubscribeEvent
public static void event(ClientPlayerNetworkEvent.RespawnEvent event) {
PlayerEvent.CLIENT_PLAYER_RESPAWN.invoker().respawn(event.getOldPlayer(), event.getNewPlayer());
ClientPlayerEvent.CLIENT_PLAYER_RESPAWN.invoker().respawn(event.getOldPlayer(), event.getNewPlayer());
}
@SubscribeEvent
@@ -94,8 +96,8 @@ public class EventHandlerImplClient {
}
@SubscribeEvent
public static void event(ClientChatEvent event) {
ActionResult<String> process = ChatEvent.CLIENT.invoker().process(event.getMessage());
public static void event(net.minecraftforge.client.event.ClientChatEvent event) {
ActionResult<String> process = ClientChatEvent.CLIENT.invoker().process(event.getMessage());
if (process.getObject() != null)
event.setMessage(process.getObject());
if (process.getResult() == ActionResultType.FAIL)
@@ -104,7 +106,7 @@ public class EventHandlerImplClient {
@SubscribeEvent
public static void event(ClientChatReceivedEvent event) {
ActionResult<ITextComponent> process = ChatEvent.CLIENT_RECEIVED.invoker().process(event.getType(), event.getMessage(), event.getSenderUUID());
ActionResult<ITextComponent> process = ClientChatEvent.CLIENT_RECEIVED.invoker().process(event.getType(), event.getMessage(), event.getSenderUUID());
if (process.getObject() != null)
event.setMessage(process.getObject());
if (process.getResult() == ActionResultType.FAIL)
@@ -115,7 +117,7 @@ public class EventHandlerImplClient {
public static void event(WorldEvent.Save event) {
if (event.getWorld() instanceof ClientWorld) {
ClientWorld world = (ClientWorld) event.getWorld();
LifecycleEvent.CLIENT_WORLD_LOAD.invoker().act(world);
ClientLifecycleEvent.CLIENT_WORLD_LOAD.invoker().act(world);
}
}

29
forge/src/main/java/me/shedaniel/architectury/hooks/forge/FluidStackHooksImpl.java
View File

@@ -1,3 +1,22 @@
/*
* This file is part of architectury.
* Copyright (C) 2020 shedaniel
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package me.shedaniel.architectury.hooks.forge;
import me.shedaniel.architectury.fluid.FluidStack;
@@ -8,11 +27,13 @@ import net.minecraft.util.text.ITextComponent;
public class FluidStackHooksImpl {
public static ITextComponent getName(FluidStack stack) {
return stack.getName();
return stack.getFluid().getAttributes().getDisplayName(
new net.minecraftforge.fluids.FluidStack(stack.getRawFluid(), stack.getAmount().intValue(), stack.getTag()));
}
public static String getTranslationKey(FluidStack stack) {
return stack.getTranslationKey();
return stack.getFluid().getAttributes().getTranslationKey(
new net.minecraftforge.fluids.FluidStack(stack.getRawFluid(), stack.getAmount().intValue(), stack.getTag()));
}
public static FluidStack read(PacketBuffer buf) {
@@ -21,7 +42,7 @@ public class FluidStackHooksImpl {
}
public static void write(FluidStack stack, PacketBuffer buf) {
stack.write(buf);
new net.minecraftforge.fluids.FluidStack(stack.getRawFluid(), stack.getAmount().intValue(), stack.getTag()).writeToPacket(buf);
}
public static FluidStack read(CompoundNBT tag) {
@@ -30,7 +51,7 @@ public class FluidStackHooksImpl {
}
public static CompoundNBT write(FluidStack stack, CompoundNBT tag) {
return stack.write(tag);
return new net.minecraftforge.fluids.FluidStack(stack.getRawFluid(), stack.getAmount().intValue(), stack.getTag()).writeToNBT(tag);
}
public static Fraction bucketAmount() {