mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-06 03:52:53 +00:00
Code Issues Releases Wiki Activity

Add some cleanup

Browse Source
This commit is contained in:
SirEdvin 2023-06-27 15:51:39 +03:00
parent de6b097f5b
commit 3996bf4eaa
8 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java
View File

@ -16,11 +16,11 @@ public final class UpgradeData<T extends UpgradeBase> {
this.data = data;
}
public @Nonnull T upgrade() {
public @Nonnull T getUpgrade() {
return upgrade;
}
public @Nonnull CompoundTag data() {
public @Nonnull CompoundTag getData() {
return data;
}

4
projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java
View File

@ -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())));
}

1
projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleUpgradeModellers.java
View File

@ -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;

2
projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java
View File

@ -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<IPocketUpgrade> upgrade) {
var upgradeInstance = upgrade == null ? null : upgrade.upgrade();
var upgradeInstance = upgrade == null ? null : upgrade.getUpgrade();
if (this.upgrade == upgradeInstance) return;
synchronized (this) {

16
projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java
View File

@ -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());
}
}

4
projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
View File

@ -569,8 +569,8 @@ public class TurtleBrain implements TurtleAccessInternal {
private boolean setUpgradeDirect(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> 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;
}

12
projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java
View File

@ -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;
}

8
projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java
View File

@ -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()));
}
}