Started work on upgrading to 1.16.1. Not in a compilable state yet

2025-11-18 22:25:12 +00:00 · 2020-07-07 13:27:13 -04:00
parent cb66ef7e30
commit 605e1f6b9b
513 changed files with 48117 additions and 534 deletions
--- a/remappedSrc/dan200/computercraft/shared/TurtleUpgrades.java
+++ b/remappedSrc/dan200/computercraft/shared/TurtleUpgrades.java
@@ -0,0 +1,89 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.shared;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.util.InventoryUtil;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+import java.util.*;
+
+public final class TurtleUpgrades
+{
+    private static final Map<String, ITurtleUpgrade> upgrades = new HashMap<>();
+
+    private TurtleUpgrades() {}
+
+    public static void register( @Nonnull ITurtleUpgrade upgrade )
+    {
+        Objects.requireNonNull( upgrade, "upgrade cannot be null" );
+
+        String id = upgrade.getUpgradeID().toString();
+        ITurtleUpgrade existing = upgrades.get( id );
+        if( existing != null )
+        {
+            throw new IllegalStateException( "Error registering '" + upgrade.getUnlocalisedAdjective() + " Turle'. UpgradeID '" + id + "' is already registered by '" + existing.getUnlocalisedAdjective() + " Turtle'" );
+        }
+
+        upgrades.put( id, upgrade );
+    }
+
+
+    public static ITurtleUpgrade get( String id )
+    {
+        return upgrades.get( id );
+    }
+
+    public static ITurtleUpgrade get( @Nonnull ItemStack stack )
+    {
+        if( stack.isEmpty() ) return null;
+
+        for( ITurtleUpgrade upgrade : upgrades.values() )
+        {
+            ItemStack craftingStack = upgrade.getCraftingItem();
+            if( !craftingStack.isEmpty() && InventoryUtil.areItemsSimilar( stack, craftingStack ) )
+            {
+                return upgrade;
+            }
+        }
+
+        return null;
+    }
+
+    public static Iterable<ITurtleUpgrade> getVanillaUpgrades()
+    {
+        List<ITurtleUpgrade> vanilla = new ArrayList<>();
+
+
+        // ComputerCraft upgrades
+        vanilla.add( ComputerCraft.TurtleUpgrades.wirelessModemNormal );
+        vanilla.add( ComputerCraft.TurtleUpgrades.wirelessModemAdvanced );
+        vanilla.add( ComputerCraft.TurtleUpgrades.speaker );
+
+        // Vanilla Minecraft upgrades
+        vanilla.add( ComputerCraft.TurtleUpgrades.diamondPickaxe );
+        vanilla.add( ComputerCraft.TurtleUpgrades.diamondAxe );
+        vanilla.add( ComputerCraft.TurtleUpgrades.diamondSword );
+        vanilla.add( ComputerCraft.TurtleUpgrades.diamondShovel );
+        vanilla.add( ComputerCraft.TurtleUpgrades.diamondHoe );
+        vanilla.add( ComputerCraft.TurtleUpgrades.craftingTable );
+        return vanilla;
+    }
+
+    public static Iterable<ITurtleUpgrade> getUpgrades()
+    {
+        return Collections.unmodifiableCollection( upgrades.values() );
+    }
+
+    public static boolean suitableForFamily( ComputerFamily family, ITurtleUpgrade upgrade )
+    {
+        return true;
+    }
+}