Make things compile on 1.18
This commit is contained in:
parent
eb1187bc7a
commit
0fa73fb409
@ -360,11 +360,11 @@ public class BlockEntityBlackHole extends BlockEntity {
|
|||||||
return writeBlackHoleData(super.getUpdateTag());
|
return writeBlackHoleData(super.getUpdateTag());
|
||||||
}
|
}
|
||||||
|
|
||||||
// called by game engine on block updsates
|
// called by game engine on block updates
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public ClientboundBlockEntityDataPacket getUpdatePacket() {
|
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
|
// called by game engine by forge patches when ClientboundBlockEntityDataPacket is received
|
||||||
|
@ -179,7 +179,7 @@ public abstract class BlockEntityMattery extends BlockEntity implements MenuProv
|
|||||||
public void setChangedLight() {
|
public void setChangedLight() {
|
||||||
if (level != null) {
|
if (level != null) {
|
||||||
if (level.hasChunkAt(getBlockPos()))
|
if (level.hasChunkAt(getBlockPos()))
|
||||||
level.getChunkAt(getBlockPos()).markUnsaved();
|
level.getChunkAt(getBlockPos()).setUnsaved(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ import net.minecraft.resources.ResourceLocation;
|
|||||||
import net.minecraft.world.effect.MobEffects;
|
import net.minecraft.world.effect.MobEffects;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.minecraft.world.entity.player.Player;
|
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.event.RenderGameOverlayEvent;
|
||||||
import net.minecraftforge.client.gui.ForgeIngameGui;
|
import net.minecraftforge.client.gui.ForgeIngameGui;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
@ -29,8 +29,8 @@ public class AndroidGui {
|
|||||||
private IAndroidCapability last_state;
|
private IAndroidCapability last_state;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onOpenGUI(GuiOpenEvent event) {
|
public static void onOpenGUI(ScreenOpenEvent event) {
|
||||||
if (!(event.getGui() instanceof DeathScreen screen))
|
if (!(event.getScreen() instanceof DeathScreen screen))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (mc.player == null)
|
if (mc.player == null)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package ru.dbotthepony.mc.otm.client;
|
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 net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
import ru.dbotthepony.mc.otm.Registry;
|
import ru.dbotthepony.mc.otm.Registry;
|
||||||
import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer;
|
import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer;
|
||||||
@ -8,9 +8,9 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability;
|
|||||||
|
|
||||||
public class EventHandler {
|
public class EventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void inputEvent(InputUpdateEvent event) {
|
public static void inputEvent(MovementInputUpdateEvent event) {
|
||||||
var ply = event.getPlayer();
|
var ply = event.getPlayer();
|
||||||
var input = event.getMovementInput();
|
var input = event.getInput();
|
||||||
|
|
||||||
ply.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> {
|
ply.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> {
|
||||||
if (!(_cap instanceof AndroidCapabilityPlayer cap))
|
if (!(_cap instanceof AndroidCapabilityPlayer cap))
|
||||||
@ -32,8 +32,8 @@ public class EventHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cap.last_jump_ticks <= 0) {
|
if (cap.last_jump_ticks <= 0) {
|
||||||
event.getMovementInput().jumping = false;
|
event.getInput().jumping = false;
|
||||||
event.getMovementInput().up = false;
|
event.getInput().up = false;
|
||||||
} else {
|
} else {
|
||||||
cap.last_jump_ticks--;
|
cap.last_jump_ticks--;
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
|
|||||||
import net.minecraft.world.inventory.ClickType;
|
import net.minecraft.world.inventory.ClickType;
|
||||||
import net.minecraft.world.inventory.Slot;
|
import net.minecraft.world.inventory.Slot;
|
||||||
import net.minecraft.world.item.ItemStack;
|
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.MatteryMenu;
|
||||||
import ru.dbotthepony.mc.otm.menu.slot.MatterySlot;
|
import ru.dbotthepony.mc.otm.menu.slot.MatterySlot;
|
||||||
import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget;
|
import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget;
|
||||||
@ -476,7 +477,7 @@ public abstract class MatteryScreen<T extends MatteryMenu> extends AbstractConta
|
|||||||
|
|
||||||
RenderSystem.depthFunc(GL_LESS);
|
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();
|
RenderSystem.disableDepthTest();
|
||||||
|
|
||||||
@ -488,7 +489,7 @@ public abstract class MatteryScreen<T extends MatteryMenu> extends AbstractConta
|
|||||||
|
|
||||||
RenderSystem.disableDepthTest();
|
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;
|
var itemstack = this.draggingItem.isEmpty() ? this.menu.getCarried() : this.draggingItem;
|
||||||
|
|
||||||
|
@ -106,9 +106,10 @@ public abstract class AbstractSlotPanel extends EditablePanel {
|
|||||||
|
|
||||||
if (!itemstack.isEmpty()) {
|
if (!itemstack.isEmpty()) {
|
||||||
Font font = net.minecraftforge.client.RenderProperties.get(itemstack).getFont(itemstack);
|
Font font = net.minecraftforge.client.RenderProperties.get(itemstack).getFont(itemstack);
|
||||||
GuiUtils.preItemToolTip(itemstack);
|
// TODO: WHERE????????????
|
||||||
screen.renderComponentToolTip(stack, getItemStackTooltip(itemstack), (int) mouse_x, (int) mouse_y, (font == null ? screen.getFont() : font));
|
// GuiUtils.preItemToolTip(itemstack);
|
||||||
GuiUtils.postItemToolTip();
|
screen.renderComponentTooltip(stack, getItemStackTooltip(itemstack), (int) mouse_x, (int) mouse_y, (font == null ? screen.getFont() : font));
|
||||||
|
// GuiUtils.postItemToolTip();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package ru.dbotthepony.mc.otm.client.screen.panels;
|
package ru.dbotthepony.mc.otm.client.screen.panels;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import net.minecraft.client.gui.components.Button;
|
import net.minecraft.client.gui.components.Button;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import ru.dbotthepony.mc.otm.client.screen.MatteryScreen;
|
import ru.dbotthepony.mc.otm.client.screen.MatteryScreen;
|
||||||
@ -14,7 +15,7 @@ public class ButtonPanel extends MinecraftWidgetPanel<Button> {
|
|||||||
super(screen, parent, x, y, width, height, (panel) -> {
|
super(screen, parent, x, y, width, height, (panel) -> {
|
||||||
return new Button(0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), label, (btn) -> ((ButtonPanel) panel).onPress()) {
|
return new Button(0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), label, (btn) -> ((ButtonPanel) panel).onPress()) {
|
||||||
@Override
|
@Override
|
||||||
public boolean isHovered() {
|
public boolean isHoveredOrFocused() {
|
||||||
return panel.is_hovered;
|
return panel.is_hovered;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -13,7 +13,7 @@ public class EditBoxPanel extends MinecraftWidgetPanel<EditBox> {
|
|||||||
super(screen, parent, x, y, width, height, (panel) -> {
|
super(screen, parent, x, y, width, height, (panel) -> {
|
||||||
return new EditBox(screen.getFont(), 0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), component) {
|
return new EditBox(screen.getFont(), 0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), component) {
|
||||||
@Override
|
@Override
|
||||||
public boolean isHovered() {
|
public boolean isHoveredOrFocused() {
|
||||||
return panel.is_hovered;
|
return panel.is_hovered;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -15,6 +15,7 @@ import net.minecraft.world.level.Level;
|
|||||||
import net.minecraftforge.common.capabilities.Capability;
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
import net.minecraftforge.common.util.LazyOptional;
|
||||||
|
import net.minecraftforge.event.ForgeEventFactory;
|
||||||
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
import ru.dbotthepony.mc.otm.OverdriveThatMatters;
|
import ru.dbotthepony.mc.otm.OverdriveThatMatters;
|
||||||
@ -71,7 +72,7 @@ public class ItemPortableCondensationDrive extends Item {
|
|||||||
|
|
||||||
event.setCanceled(true);
|
event.setCanceled(true);
|
||||||
|
|
||||||
net.minecraftforge.fmllegacy.hooks.BasicEventHooks.firePlayerItemPickupEvent(event.getPlayer(), event.getItem(), copy);
|
ForgeEventFactory.firePlayerItemPickupEvent(event.getPlayer(), event.getItem(), copy);
|
||||||
|
|
||||||
if (remaining.getCount() > 0) {
|
if (remaining.getCount() > 0) {
|
||||||
event.getItem().getItem().setCount(remaining.getCount());
|
event.getItem().getItem().setCount(remaining.getCount());
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
modLoader="javafml" #mandatory
|
modLoader="javafml" #mandatory
|
||||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||||
loaderVersion="[37,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
loaderVersion="[38,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||||
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
||||||
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||||
license="MIT"
|
license="MIT"
|
||||||
@ -43,7 +43,7 @@ A mod about matter. And science fiction on top of it.
|
|||||||
# Does this dependency have to exist - if not, ordering below must be specified
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
mandatory=true #mandatory
|
mandatory=true #mandatory
|
||||||
# The version range of the dependency
|
# The version range of the dependency
|
||||||
versionRange="[37,)" #mandatory
|
versionRange="[38,)" #mandatory
|
||||||
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
||||||
@ -53,6 +53,6 @@ A mod about matter. And science fiction on top of it.
|
|||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
||||||
versionRange="[1.17.1,1.18)"
|
versionRange="[1.18,1.19)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="BOTH"
|
side="BOTH"
|
||||||
|
Loading…
Reference in New Issue
Block a user