diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java index 4c1f234bf..03995c352 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java @@ -360,11 +360,11 @@ public class BlockEntityBlackHole extends BlockEntity { return writeBlackHoleData(super.getUpdateTag()); } - // called by game engine on block updsates + // called by game engine on block updates @Nullable @Override public ClientboundBlockEntityDataPacket getUpdatePacket() { - return new ClientboundBlockEntityDataPacket(getBlockPos(), 0, writeBlackHoleData(new CompoundTag())); + return ClientboundBlockEntityDataPacket.create(this); } // called by game engine by forge patches when ClientboundBlockEntityDataPacket is received diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java index 6384f450c..6e4f00fd1 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java @@ -179,7 +179,7 @@ public abstract class BlockEntityMattery extends BlockEntity implements MenuProv public void setChangedLight() { if (level != null) { if (level.hasChunkAt(getBlockPos())) - level.getChunkAt(getBlockPos()).markUnsaved(); + level.getChunkAt(getBlockPos()).setUnsaved(true); } } } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java b/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java index 6d9227a09..0ca6b5222 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java @@ -9,7 +9,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.client.event.ScreenOpenEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.gui.ForgeIngameGui; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -29,8 +29,8 @@ public class AndroidGui { private IAndroidCapability last_state; @SubscribeEvent - public static void onOpenGUI(GuiOpenEvent event) { - if (!(event.getGui() instanceof DeathScreen screen)) + public static void onOpenGUI(ScreenOpenEvent event) { + if (!(event.getScreen() instanceof DeathScreen screen)) return; if (mc.player == null) diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java b/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java index c005b151b..6e89bfd19 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java @@ -1,6 +1,6 @@ package ru.dbotthepony.mc.otm.client; -import net.minecraftforge.client.event.InputUpdateEvent; +import net.minecraftforge.client.event.MovementInputUpdateEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; @@ -8,9 +8,9 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability; public class EventHandler { @SubscribeEvent - public static void inputEvent(InputUpdateEvent event) { + public static void inputEvent(MovementInputUpdateEvent event) { var ply = event.getPlayer(); - var input = event.getMovementInput(); + var input = event.getInput(); ply.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> { if (!(_cap instanceof AndroidCapabilityPlayer cap)) @@ -32,8 +32,8 @@ public class EventHandler { } if (cap.last_jump_ticks <= 0) { - event.getMovementInput().jumping = false; - event.getMovementInput().up = false; + event.getInput().jumping = false; + event.getInput().up = false; } else { cap.last_jump_ticks--; } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java index cb99daf43..000f15547 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.java @@ -18,6 +18,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import net.minecraftforge.client.event.ContainerScreenEvent; import ru.dbotthepony.mc.otm.menu.MatteryMenu; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; @@ -476,7 +477,7 @@ public abstract class MatteryScreen extends AbstractConta RenderSystem.depthFunc(GL_LESS); - net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiContainerEvent.DrawBackground(this, pose, mouse_x, mouse_y)); + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new ContainerScreenEvent.DrawBackground(this, pose, mouse_x, mouse_y)); RenderSystem.disableDepthTest(); @@ -488,7 +489,7 @@ public abstract class MatteryScreen extends AbstractConta RenderSystem.disableDepthTest(); - net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiContainerEvent.DrawForeground(this, pose, mouse_x, mouse_y)); + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new ContainerScreenEvent.DrawForeground(this, pose, mouse_x, mouse_y)); var itemstack = this.draggingItem.isEmpty() ? this.menu.getCarried() : this.draggingItem; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java index a93fdd741..b60f18c3d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java @@ -106,9 +106,10 @@ public abstract class AbstractSlotPanel extends EditablePanel { if (!itemstack.isEmpty()) { Font font = net.minecraftforge.client.RenderProperties.get(itemstack).getFont(itemstack); - GuiUtils.preItemToolTip(itemstack); - screen.renderComponentToolTip(stack, getItemStackTooltip(itemstack), (int) mouse_x, (int) mouse_y, (font == null ? screen.getFont() : font)); - GuiUtils.postItemToolTip(); + // TODO: WHERE???????????? + // GuiUtils.preItemToolTip(itemstack); + screen.renderComponentTooltip(stack, getItemStackTooltip(itemstack), (int) mouse_x, (int) mouse_y, (font == null ? screen.getFont() : font)); + // GuiUtils.postItemToolTip(); return true; } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java index 14e8f6c1d..c31541ce2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.java @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.client.screen.panels; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; @@ -14,7 +15,7 @@ public class ButtonPanel extends MinecraftWidgetPanel