From 3996bf4eaa754d41f395a1c9f3d7cd26a40a51cd Mon Sep 17 00:00:00 2001 From: SirEdvin Date: Tue, 27 Jun 2023 15:51:39 +0300 Subject: [PATCH] Add some cleanup --- .../computercraft/api/upgrades/UpgradeData.java | 4 ++-- .../client/model/turtle/TurtleModelParts.java | 4 ++-- .../client/turtle/TurtleUpgradeModellers.java | 1 - .../shared/pocket/core/PocketServerComputer.java | 2 +- .../shared/pocket/items/PocketComputerItem.java | 16 ++++++++-------- .../shared/turtle/core/TurtleBrain.java | 4 ++-- .../shared/turtle/items/TurtleItem.java | 12 ++++++------ .../computercraft/gametest/core/TestMod.java | 8 +------- 8 files changed, 22 insertions(+), 29 deletions(-) diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java b/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java index 5646cfc98..1a21c82d3 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java @@ -16,11 +16,11 @@ public final class UpgradeData { this.data = data; } - public @Nonnull T upgrade() { + public @Nonnull T getUpgrade() { return upgrade; } - public @Nonnull CompoundTag data() { + public @Nonnull CompoundTag getData() { return data; } diff --git a/projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java b/projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java index 434de2ac1..bf13a8946 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java +++ b/projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java @@ -99,11 +99,11 @@ public final class TurtleModelParts { parts.add(transform(ClientPlatformHelper.get().getModel(modelManager, overlayModelLocation), transformation)); } if (combo.leftUpgrade() != null) { - var model = TurtleUpgradeModellers.getModel(combo.leftUpgrade().upgrade(), combo.leftUpgrade().data(), TurtleSide.LEFT); + var model = TurtleUpgradeModellers.getModel(combo.leftUpgrade().getUpgrade(), combo.leftUpgrade().getData(), TurtleSide.LEFT); parts.add(transform(model.getModel(), transformation.compose(model.getMatrix()))); } if (combo.rightUpgrade() != null) { - var model = TurtleUpgradeModellers.getModel(combo.rightUpgrade().upgrade(), combo.rightUpgrade().data(), TurtleSide.RIGHT); + var model = TurtleUpgradeModellers.getModel(combo.rightUpgrade().getUpgrade(), combo.rightUpgrade().getData(), TurtleSide.RIGHT); parts.add(transform(model.getModel(), transformation.compose(model.getMatrix()))); } diff --git a/projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleUpgradeModellers.java b/projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleUpgradeModellers.java index 02257f6bd..40672cf9f 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleUpgradeModellers.java +++ b/projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleUpgradeModellers.java @@ -11,7 +11,6 @@ import dan200.computercraft.api.turtle.ITurtleAccess; import dan200.computercraft.api.turtle.ITurtleUpgrade; import dan200.computercraft.api.turtle.TurtleSide; import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser; -import dan200.computercraft.api.upgrades.UpgradeData; import dan200.computercraft.impl.TurtleUpgrades; import dan200.computercraft.impl.UpgradeManager; import net.minecraft.client.Minecraft; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java index dab7d2529..221b1b12c 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java @@ -128,7 +128,7 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces * @param upgrade The new upgrade to set it to, may be {@code null}. */ public void setUpgrade(@Nullable UpgradeData upgrade) { - var upgradeInstance = upgrade == null ? null : upgrade.upgrade(); + var upgradeInstance = upgrade == null ? null : upgrade.getUpgrade(); if (this.upgrade == upgradeInstance) return; synchronized (this) { diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java index 7fd6d6ba7..dfca07a81 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java @@ -73,7 +73,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I if (label != null) result.setHoverName(Component.literal(label)); if (upgrade != null) { result.getOrCreateTag().putString(NBT_UPGRADE, upgrade.getUpgradeID().toString()); - if (!upgrade.data().isEmpty()) result.getOrCreateTag().put(NBT_UPGRADE_INFO, upgrade.data()); + if (!upgrade.getData().isEmpty()) result.getOrCreateTag().put(NBT_UPGRADE_INFO, upgrade.getData()); } if (colour != -1) result.getOrCreateTag().putInt(NBT_COLOUR, colour); return result; @@ -83,7 +83,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I var upgrade = getUpgrade(stack); computer.setLevel((ServerLevel) world); - computer.updateValues(entity, stack, upgrade != null ? upgrade.upgrade() : null); + computer.updateValues(entity, stack, upgrade != null ? upgrade.getUpgrade() : null); var changed = false; @@ -108,7 +108,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I } // Update pocket upgrade - if (upgrade != null) upgrade.upgrade().update(computer, computer.getPeripheral(ComputerSide.BACK)); + if (upgrade != null) upgrade.getUpgrade().update(computer, computer.getPeripheral(ComputerSide.BACK)); return changed; } @@ -143,8 +143,8 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I var stop = false; var upgrade = getUpgrade(stack); if (upgrade != null) { - computer.updateValues(player, stack, upgrade.upgrade()); - stop = upgrade.upgrade().onRightClick(world, computer, computer.getPeripheral(ComputerSide.BACK)); + computer.updateValues(player, stack, upgrade.getUpgrade()); + stop = upgrade.getUpgrade().onRightClick(world, computer, computer.getPeripheral(ComputerSide.BACK)); } if (!stop) { @@ -187,7 +187,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I if (upgrade != null) { // If we're a non-vanilla, non-CC upgrade then return whichever mod this upgrade // belongs to. - var mod = PocketUpgrades.instance().getOwner(upgrade.upgrade()); + var mod = PocketUpgrades.instance().getOwner(upgrade.getUpgrade()); if (mod != null && !mod.equals(ComputerCraftAPI.MOD_ID)) return mod; } @@ -213,7 +213,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I var upgrade = getUpgrade(stack); - computer.updateValues(entity, stack, upgrade != null ? upgrade.upgrade() : null); + computer.updateValues(entity, stack, upgrade != null ? upgrade.getUpgrade() : null); computer.addAPI(new PocketAPI(computer)); // Only turn on when initially creating the computer, rather than each tick. @@ -317,7 +317,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I compound.remove(NBT_UPGRADE_INFO); } else { compound.putString(NBT_UPGRADE, upgrade.getUpgradeID().toString()); - compound.put(NBT_UPGRADE_INFO, upgrade.data()); + compound.put(NBT_UPGRADE_INFO, upgrade.getData()); } } diff --git a/projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java b/projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java index db158fdaf..59b0e2243 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java @@ -569,8 +569,8 @@ public class TurtleBrain implements TurtleAccessInternal { private boolean setUpgradeDirect(TurtleSide side, @Nullable UpgradeData upgrade) { if (upgrade == null) return setUpgradeDirect(side, (ITurtleUpgrade) null); - var result = setUpgradeDirect(side, upgrade.upgrade()); - if (result) upgradeNBTData.put(side, upgrade.data()); + var result = setUpgradeDirect(side, upgrade.getUpgrade()); + if (result) upgradeNBTData.put(side, upgrade.getData()); return result; } diff --git a/projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java b/projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java index d939e773e..4bcc3a2cb 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java @@ -60,15 +60,15 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem { if (leftUpgrade != null) { stack.getOrCreateTag().putString(NBT_LEFT_UPGRADE, leftUpgrade.getUpgradeID().toString()); - if (!leftUpgrade.data().isEmpty()) { - stack.getOrCreateTag().put(NBT_LEFT_UPGRADE_DATA, leftUpgrade.data()); + if (!leftUpgrade.getData().isEmpty()) { + stack.getOrCreateTag().put(NBT_LEFT_UPGRADE_DATA, leftUpgrade.getData()); } } if (rightUpgrade != null) { stack.getOrCreateTag().putString(NBT_RIGHT_UPGRADE, rightUpgrade.getUpgradeID().toString()); - if (!rightUpgrade.data().isEmpty()) { - stack.getOrCreateTag().put(NBT_RIGHT_UPGRADE_DATA, rightUpgrade.data()); + if (!rightUpgrade.getData().isEmpty()) { + stack.getOrCreateTag().put(NBT_RIGHT_UPGRADE_DATA, rightUpgrade.getData()); } } return stack; @@ -105,13 +105,13 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem { var left = getUpgrade(stack, TurtleSide.LEFT); if (left != null) { - var mod = TurtleUpgrades.instance().getOwner(left.upgrade()); + var mod = TurtleUpgrades.instance().getOwner(left.getUpgrade()); if (mod != null && !mod.equals(ComputerCraftAPI.MOD_ID)) return mod; } var right = getUpgrade(stack, TurtleSide.RIGHT); if (right != null) { - var mod = TurtleUpgrades.instance().getOwner(right.upgrade()); + var mod = TurtleUpgrades.instance().getOwner(right.getUpgrade()); if (mod != null && !mod.equals(ComputerCraftAPI.MOD_ID)) return mod; } diff --git a/projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java b/projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java index 7eafb2b85..34c76c0bd 100644 --- a/projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java +++ b/projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java @@ -22,10 +22,8 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; import java.util.function.Supplier; @@ -65,10 +63,6 @@ public class TestMod { bus.addListener((RegisterClientCommandsEvent e) -> Exporter.register(e.getDispatcher())); var modBus = FMLJavaModLoadingContext.get().getModEventBus(); - modBus.addListener((FMLClientSetupEvent e) -> { - for (int i = 0; i < 100; i++) - System.out.println("JGHASVDFHGVSDFSDFSDF"); - ComputerCraftAPIClient.registerTurtleUpgradeModeller(ENCHANTED_TOOL.get(), TurtleUpgradeModeller.flatItem()); - }); + modBus.addListener((FMLClientSetupEvent e) -> ComputerCraftAPIClient.registerTurtleUpgradeModeller(ENCHANTED_TOOL.get(), TurtleUpgradeModeller.flatItem())); } }