From a2e0ad8485a0ee207bf23d7d207f546e13efc565 Mon Sep 17 00:00:00 2001 From: Goldenfield192 <1437356849@qq.com> Date: Fri, 2 Jan 2026 22:28:01 +0800 Subject: [PATCH 1/3] remove GUI deprecated methods --- .../cam72cam/mod/gui/container/IContainer.java | 7 +------ src/main/java/cam72cam/mod/gui/screen/Button.java | 12 ------------ .../java/cam72cam/mod/gui/screen/CheckBox.java | 8 -------- src/main/java/cam72cam/mod/gui/screen/IScreen.java | 14 ++------------ src/main/java/cam72cam/mod/gui/screen/Slider.java | 10 ---------- .../java/cam72cam/mod/gui/screen/TextField.java | 5 ----- 6 files changed, 3 insertions(+), 53 deletions(-) diff --git a/src/main/java/cam72cam/mod/gui/container/IContainer.java b/src/main/java/cam72cam/mod/gui/container/IContainer.java index 6f1e6a306..9797ea66b 100644 --- a/src/main/java/cam72cam/mod/gui/container/IContainer.java +++ b/src/main/java/cam72cam/mod/gui/container/IContainer.java @@ -8,13 +8,8 @@ * @see cam72cam.mod.gui.GuiRegistry for more details */ public interface IContainer { - @Deprecated - default void draw(IContainerBuilder builder) { } - /** Called once server side to layout the GUI and every tick client side to actually draw the screen + slots */ - default void draw(IContainerBuilder builder, RenderState state) { - draw(builder); - } + void draw(IContainerBuilder builder, RenderState state); /** Width of this container in slots */ int getSlotsX(); diff --git a/src/main/java/cam72cam/mod/gui/screen/Button.java b/src/main/java/cam72cam/mod/gui/screen/Button.java index 1675f3c56..6ba8aee7f 100644 --- a/src/main/java/cam72cam/mod/gui/screen/Button.java +++ b/src/main/java/cam72cam/mod/gui/screen/Button.java @@ -23,11 +23,6 @@ public class Button implements IWidget{ /** Default width/height */ public Button(IScreenBuilder builder, int x, int y, String text, BiConsumer handler) { this(builder, x, y, 200, 20, text, handler); - } - - @Deprecated - public Button(IScreenBuilder builder, int x, int y, String text) { - this(builder, x, y, 200, 20, text, (hand, button1) -> {}); } /** Custom width/height */ @@ -37,13 +32,6 @@ public Button(IScreenBuilder builder, int x, int y, int width, int height, Strin handler); } - @Deprecated - public Button(IScreenBuilder builder, int x, int y, int width, int height, String text) { - this(builder, - new GuiButton(-1, builder.getWidth() / 2 + x, builder.getHeight() / 4 + y, width, height, text), - (hand, button1) -> {}); - } - /** Internal ctr */ protected Button(IScreenBuilder builder, GuiButton button, BiConsumer handler) { this.button = button; diff --git a/src/main/java/cam72cam/mod/gui/screen/CheckBox.java b/src/main/java/cam72cam/mod/gui/screen/CheckBox.java index c79714ad1..cc82683f4 100644 --- a/src/main/java/cam72cam/mod/gui/screen/CheckBox.java +++ b/src/main/java/cam72cam/mod/gui/screen/CheckBox.java @@ -13,14 +13,6 @@ public CheckBox(IScreenBuilder builder, int x, int y, String text, boolean enabl ((hand, button1) -> handler.accept(hand, (CheckBox) button1))); } - @Deprecated - public CheckBox(IScreenBuilder builder, int x, int y, String text, boolean enabled) { - super(builder, - new GuiCheckBox(-1, builder.getWidth() / 2 + x, builder.getHeight() / 4 + y, text, enabled), - ((hand, button1) -> {})); - } - - public boolean isChecked() { return ((GuiCheckBox) this.button).isChecked(); } diff --git a/src/main/java/cam72cam/mod/gui/screen/IScreen.java b/src/main/java/cam72cam/mod/gui/screen/IScreen.java index 43d49aa73..0bb7f3045 100644 --- a/src/main/java/cam72cam/mod/gui/screen/IScreen.java +++ b/src/main/java/cam72cam/mod/gui/screen/IScreen.java @@ -8,14 +8,8 @@ public interface IScreen { /** Called when screen is initially constructed */ void init(IScreenBuilder screen); - @Deprecated - default void onEnterKey(IScreenBuilder builder) { } /** Called when any key is pressed outside textfield */ - default void onKeyType(IScreenBuilder builder, Keyboard.KeyCode keyCode){ - if (keyCode == Keyboard.KeyCode.NUMPADENTER || keyCode == Keyboard.KeyCode.RETURN) { - onEnterKey(builder); - } - } + void onKeyType(IScreenBuilder builder, Keyboard.KeyCode keyCode); /** * Called when player click his mouse outside textfield @@ -28,10 +22,6 @@ default void onMouseClick(int x, int y, Player.Hand hand){ /** Called during close */ void onClose(); - @Deprecated - default void draw(IScreenBuilder builder) { } /** Called once per screen draw */ - default void draw(IScreenBuilder builder, RenderState state) { - draw(builder); - } + void draw(IScreenBuilder builder, RenderState state); } diff --git a/src/main/java/cam72cam/mod/gui/screen/Slider.java b/src/main/java/cam72cam/mod/gui/screen/Slider.java index 07a1931a3..2063e8af0 100644 --- a/src/main/java/cam72cam/mod/gui/screen/Slider.java +++ b/src/main/java/cam72cam/mod/gui/screen/Slider.java @@ -19,16 +19,6 @@ public Slider(IScreenBuilder builder, int x, int y, int width, int height, Strin ((GuiSlider) this.button).parent = slider -> Slider.this.onSlider(); } - - @Deprecated - public Slider(IScreenBuilder builder, int x, int y, String text, double min, double max, double start, boolean doublePrecision) { - super(builder, - new GuiSlider(-1, builder.getWidth() / 2 + x, builder.getHeight() / 4 + y, text, min, max, start, null), - ((hand, button1) -> {})); - ((GuiSlider) this.button).showDecimal = doublePrecision; - ((GuiSlider) this.button).parent = slider -> Slider.this.onSlider(); - } - /** Called when the slider value is changed */ public void onSlider() { this.handler.accept(Player.Hand.PRIMARY, this); diff --git a/src/main/java/cam72cam/mod/gui/screen/TextField.java b/src/main/java/cam72cam/mod/gui/screen/TextField.java index 9d02856de..9b3e3ec88 100644 --- a/src/main/java/cam72cam/mod/gui/screen/TextField.java +++ b/src/main/java/cam72cam/mod/gui/screen/TextField.java @@ -37,11 +37,6 @@ public void setVisible(boolean visible) { textfield.setEnabled(visible); } - @Deprecated - public void setVisible(Boolean visible) { - this.setVisible(visible.booleanValue()); - } - @Override public boolean isVisible() { return textfield.getVisible(); From f6467fc3f19f0ed399c48a7a5d9256d4d62d7b44 Mon Sep 17 00:00:00 2001 From: Goldenfield192 <1437356849@qq.com> Date: Fri, 2 Jan 2026 22:33:14 +0800 Subject: [PATCH 2/3] remove World.getBlockEntities to catch up with 1.18+ --- src/main/java/cam72cam/mod/world/World.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/cam72cam/mod/world/World.java b/src/main/java/cam72cam/mod/world/World.java index d2e025fd9..df4862829 100644 --- a/src/main/java/cam72cam/mod/world/World.java +++ b/src/main/java/cam72cam/mod/world/World.java @@ -338,14 +338,6 @@ public T getTileEntity(Vec3i pos return null; } - /** Get all block entities of the given type */ - public List getBlockEntities(Class cls) { - return internal.loadedTileEntityList.stream() - .filter(x -> x instanceof TileEntity && ((TileEntity) x).isLoaded() && cls.isInstance(((TileEntity) x).instance())) - .map(x -> (T) ((TileEntity) x).instance()) - .collect(Collectors.toList()); - } - /** Get a block entity at the position, assuming type */ public T getBlockEntity(Vec3i pos, Class cls) { TileEntity te = getTileEntity(pos, TileEntity.class); From 7058c22cfd9a4ffd09aeae6e82bb66985b99baf5 Mon Sep 17 00:00:00 2001 From: Goldenfield192 <1437356849@qq.com> Date: Fri, 2 Jan 2026 22:35:55 +0800 Subject: [PATCH 3/3] remove some other deprecated method --- src/main/java/cam72cam/mod/block/BlockType.java | 9 --------- src/main/java/cam72cam/mod/entity/Player.java | 5 ----- src/main/java/cam72cam/mod/item/ItemStack.java | 5 ----- src/main/java/cam72cam/mod/item/ItemStackHandler.java | 10 ---------- 4 files changed, 29 deletions(-) diff --git a/src/main/java/cam72cam/mod/block/BlockType.java b/src/main/java/cam72cam/mod/block/BlockType.java index cfd4a4cd7..76f354fc3 100644 --- a/src/main/java/cam72cam/mod/block/BlockType.java +++ b/src/main/java/cam72cam/mod/block/BlockType.java @@ -248,15 +248,6 @@ public boolean canBeConnectedTo(IBlockAccess internal, BlockPos pos, EnumFacing return BlockType.this.isConnectable(); } - @Deprecated - @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) { - if (BlockType.this.isConnectable()) { - return super.getBlockFaceShape(p_193383_1_, p_193383_2_, p_193383_3_, p_193383_4_); - } - return BlockFaceShape.UNDEFINED; - } - public boolean tryBreak(net.minecraft.world.World world, BlockPos pos, EntityPlayer player) { return BlockType.this.tryBreak(World.get(world), new Vec3i(pos), new Player(player)); } diff --git a/src/main/java/cam72cam/mod/entity/Player.java b/src/main/java/cam72cam/mod/entity/Player.java index 2156f0c9f..db78f082f 100644 --- a/src/main/java/cam72cam/mod/entity/Player.java +++ b/src/main/java/cam72cam/mod/entity/Player.java @@ -41,11 +41,6 @@ public boolean isCreative() { return internal.isCreative(); } - @Deprecated - public float getYawHead() { - return internal.rotationYawHead; - } - public void setHeldItem(Hand hand, ItemStack stack) { internal.setHeldItem(hand.internal, stack.internal); } diff --git a/src/main/java/cam72cam/mod/item/ItemStack.java b/src/main/java/cam72cam/mod/item/ItemStack.java index fbb9036e1..dfae778f2 100644 --- a/src/main/java/cam72cam/mod/item/ItemStack.java +++ b/src/main/java/cam72cam/mod/item/ItemStack.java @@ -27,11 +27,6 @@ public ItemStack(CustomItem item, int i) { this(new net.minecraft.item.ItemStack(item.internal, i)); } - @Deprecated - public ItemStack(String item, int i, int meta) { - this(new net.minecraft.item.ItemStack(Item.getByNameOrId(item), i, meta)); - } - /** Tag attached to this stack */ public TagCompound getTagCompound() { if (internal.getTagCompound() == null) { diff --git a/src/main/java/cam72cam/mod/item/ItemStackHandler.java b/src/main/java/cam72cam/mod/item/ItemStackHandler.java index 6755adc58..a49212e2a 100644 --- a/src/main/java/cam72cam/mod/item/ItemStackHandler.java +++ b/src/main/java/cam72cam/mod/item/ItemStackHandler.java @@ -113,16 +113,6 @@ public int getLimit(int slot) { return internal.getSlotLimit(slot); } - @Deprecated - public TagCompound save() { - return new TagCompound(internal.serializeNBT()); - } - - @Deprecated - public void load(TagCompound items) { - internal.deserializeNBT(items.internal); - } - public static class TagMapper implements cam72cam.mod.serialization.TagMapper { @Override public TagAccessor apply(Class type, String fieldName, TagField tag) throws SerializationException {