Merge branch 'master' into mc-1.14.x

Unfortunately we can't apply the config changes due to backwards
compatibility. This'll be something we may need to PR into Forge.

CraftTweaker support still needs to be added.

src/main/java/dan200/computercraft/shared/TurtleUpgrades.java

@@ -17,11 +17,33 @@ import net.minecraftforge.fml.ModLoadingContext;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.*;
+import java.util.stream.Stream;
 
 public final class TurtleUpgrades
 {
+    public static class Wrapper
+    {
+        final ITurtleUpgrade upgrade;
+        final int legacyId;
+        final String id;
+        final String modId;
+        boolean enabled;
+
+        public Wrapper( ITurtleUpgrade upgrade )
+        {
+            ModContainer mc = ModLoadingContext.get().getActiveContainer();
+
+            this.upgrade = upgrade;
+            this.id = upgrade.getUpgradeID().toString();
+            this.modId = mc != null && mc.getModId() != null ? mc.getModId() : null;
+            this.enabled = true;
+        }
+    }
+
+    private static ITurtleUpgrade[] vanilla;
+
     private static final Map<String, ITurtleUpgrade> upgrades = new HashMap<>();
-    private static final IdentityHashMap<ITurtleUpgrade, String> upgradeOwners = new IdentityHashMap<>();
+    private static final IdentityHashMap<ITurtleUpgrade, Wrapper> wrappers = new IdentityHashMap<>();
 
     private TurtleUpgrades() {}
 
@@ -29,7 +51,8 @@ public final class TurtleUpgrades
     {
         Objects.requireNonNull( upgrade, "upgrade cannot be null" );
 
-        String id = upgrade.getUpgradeID().toString();
+        Wrapper wrapper = new Wrapper( upgrade );
+        String id = wrapper.id;
         ITurtleUpgrade existing = upgrades.get( id );
         if( existing != null )
         {
@@ -37,17 +60,28 @@ public final class TurtleUpgrades
         }
 
         upgrades.put( id, upgrade );
-
-        ModContainer mc = ModLoadingContext.get().getActiveContainer();
-        if( mc != null && mc.getModId() != null ) upgradeOwners.put( upgrade, mc.getModId() );
+        wrappers.put( upgrade, wrapper );
     }
 
-
+    @Nullable
     public static ITurtleUpgrade get( String id )
     {
         return upgrades.get( id );
     }
 
+    @Nullable
+    public static ITurtleUpgrade get( int id )
+    {
+        return legacyUpgrades.get( id );
+    }
+
+    @Nullable
+    public static String getOwner( @Nonnull ITurtleUpgrade upgrade )
+    {
+        Wrapper wrapper = wrappers.get( upgrade );
+        return wrapper != null ? wrapper.modId : null;
+    }
+
     public static ITurtleUpgrade get( @Nonnull ItemStack stack )
     {
         if( stack.isEmpty() ) return null;
@@ -64,30 +98,27 @@ public final class TurtleUpgrades
         return null;
     }
 
-    public static Iterable<ITurtleUpgrade> getVanillaUpgrades()
+    public static Stream<ITurtleUpgrade> getVanillaUpgrades()
     {
-        List<ITurtleUpgrade> vanilla = new ArrayList<>();
+        if( vanilla == null )
+        {
+            vanilla = new ITurtleUpgrade[] {
+                // ComputerCraft upgrades
+                ComputerCraft.TurtleUpgrades.wirelessModemNormal,
+                ComputerCraft.TurtleUpgrades.wirelessModemAdvanced,
+                ComputerCraft.TurtleUpgrades.speaker,
 
+                // Vanilla Minecraft upgrades
+                ComputerCraft.TurtleUpgrades.diamondPickaxe,
+                ComputerCraft.TurtleUpgrades.diamondAxe,
+                ComputerCraft.TurtleUpgrades.diamondSword,
+                ComputerCraft.TurtleUpgrades.diamondShovel,
+                ComputerCraft.TurtleUpgrades.diamondHoe,
+                ComputerCraft.TurtleUpgrades.craftingTable,
+            };
+        }
 
-        // 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;
-    }
-
-    @Nullable
-    public static String getOwner( @Nonnull ITurtleUpgrade upgrade )
-    {
-        return upgradeOwners.get( upgrade );
+        return Arrays.stream( vanilla ).filter( x -> x != null && wrappers.get( x ).enabled );
     }
 
     public static Iterable<ITurtleUpgrade> getUpgrades()
@@ -99,4 +130,14 @@ public final class TurtleUpgrades
     {
         return true;
     }
+
+    public static void disable( ITurtleUpgrade upgrade )
+    {
+        Wrapper wrapper = wrappers.get( upgrade );
+        if( !wrapper.enabled ) return;
+
+        wrapper.enabled = false;
+        upgrades.remove( wrapper.id );
+        if( wrapper.legacyId >= 0 ) legacyUpgrades.remove( wrapper.legacyId );
+    }
 }

src/main/java/dan200/computercraft/shared/integration/crafttweaker/TurtleTweaker.java

@@ -0,0 +1,70 @@
+/*
+ * 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.integration.crafttweaker;
+
+import crafttweaker.CraftTweakerAPI;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenDoc;
+import crafttweaker.annotations.ZenRegister;
+import crafttweaker.api.item.IItemStack;
+import crafttweaker.api.minecraft.CraftTweakerMC;
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.integration.crafttweaker.actions.AddTurtleTool;
+import dan200.computercraft.shared.integration.crafttweaker.actions.RemoveTurtleUpgradeByItem;
+import dan200.computercraft.shared.integration.crafttweaker.actions.RemoveTurtleUpgradeByName;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
+
+@ZenRegister
+@ZenClass( "dan200.computercraft.turtle" )
+@ModOnly( ComputerCraft.MOD_ID )
+public class TurtleTweaker
+{
+    @ZenMethod
+    @ZenDoc( "Remove a turtle upgrade with the given id" )
+    public static void removeUpgrade( String upgrade )
+    {
+        CraftTweakerAPI.apply( new RemoveTurtleUpgradeByName( upgrade ) );
+    }
+
+    @ZenMethod
+    @ZenDoc( "Remove a turtle upgrade crafted with the given item stack" )
+    public static void removeUpgrade( IItemStack stack )
+    {
+        CraftTweakerAPI.apply( new RemoveTurtleUpgradeByItem( CraftTweakerMC.getItemStack( stack ) ) );
+    }
+
+    @ZenMethod
+    @ZenDoc( "Add a new turtle tool with the given id, which crafts and acts using the given stack." )
+    public static void addTool( String id, IItemStack stack )
+    {
+        addTool( id, stack, stack, "tool" );
+    }
+
+    @ZenMethod
+    @ZenDoc( "Add a new turtle tool with the given id, which is crafted with one item, and uses another." )
+    public static void addTool( String id, IItemStack craftingStack, IItemStack toolStack )
+    {
+        addTool( id, craftingStack, toolStack, "tool" );
+    }
+
+    @ZenMethod
+    @ZenDoc( "Add a new turtle tool with the given id, which crafts and acts using the given stack. You may also" +
+        "specify a 'kind' of tool, which limits what blocks the turtle can break (for instance, an 'axe' may only break wood)." )
+    public static void addTool( String id, IItemStack stack, String kind )
+    {
+        addTool( id, stack, stack, kind );
+    }
+
+    @ZenMethod
+    @ZenDoc( "Add a new turtle tool with the given id, which is crafted with one item, and uses another. You may also" +
+        "specify a 'kind' of tool, which limits what blocks the turtle can break (for instance, an 'axe' may only break wood)." )
+    public static void addTool( String id, IItemStack craftingStack, IItemStack toolStack, String kind )
+    {
+        CraftTweakerAPI.apply( new AddTurtleTool( id, CraftTweakerMC.getItemStack( craftingStack ), CraftTweakerMC.getItemStack( toolStack ), kind ) );
+    }
+}

src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java

@@ -0,0 +1,96 @@
+/*
+ * 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.integration.crafttweaker.actions;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.TurtleUpgrades;
+import dan200.computercraft.shared.turtle.upgrades.*;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Register a new turtle tool.
+ */
+public class AddTurtleTool implements IAction
+{
+    private interface Factory
+    {
+        TurtleTool create( ResourceLocation location, ItemStack craftItem, ItemStack toolItem );
+    }
+
+    private static final Map<String, Factory> kinds = new HashMap<>();
+
+    static
+    {
+        kinds.put( "tool", TurtleTool::new );
+        kinds.put( "axe", TurtleAxe::new );
+        kinds.put( "hoe", TurtleHoe::new );
+        kinds.put( "shovel", TurtleShovel::new );
+        kinds.put( "sword", TurtleSword::new );
+    }
+
+    private final String id;
+    private final ItemStack craftItem;
+    private final ItemStack toolItem;
+    private final String kind;
+
+    public AddTurtleTool( String id, ItemStack craftItem, ItemStack toolItem, String kind )
+    {
+        this.id = id;
+        this.craftItem = craftItem;
+        this.toolItem = toolItem;
+        this.kind = kind;
+    }
+
+    @Override
+    public void apply()
+    {
+        Factory factory = kinds.get( kind );
+        if( factory == null )
+        {
+            ComputerCraft.log.error( "Unknown turtle upgrade kind '{}' (this should have been rejected by verify!)", kind );
+            return;
+        }
+
+        try
+        {
+            TurtleUpgrades.register( factory.create( new ResourceLocation( id ), craftItem, toolItem ) );
+        }
+        catch( RuntimeException e )
+        {
+            ComputerCraft.log.error( "Registration of turtle tool failed", e );
+        }
+    }
+
+    @Override
+    public String describe()
+    {
+        return String.format( "Add new turtle %s '%s' (crafted with '%s', uses a '%s')", kind, id, craftItem, toolItem );
+    }
+
+    public Optional<String> getValidationProblem()
+    {
+        if( craftItem.isEmpty() ) return Optional.of( "Crafting item stack is empty." );
+        if( craftItem.hasTagCompound() && !craftItem.getTagCompound().isEmpty() )
+        {
+            return Optional.of( "Crafting item has NBT." );
+        }
+        if( toolItem.isEmpty() ) return Optional.of( "Tool item stack is empty." );
+        if( !kinds.containsKey( kind ) ) return Optional.of( String.format( "Unknown kind '%s'.", kind ) );
+
+        if( TurtleUpgrades.get( id ) != null )
+        {
+            return Optional.of( String.format( "An upgrade with the same name ('%s') has already been registered.", id ) );
+        }
+
+        return Optional.empty();
+    }
+}

src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/IAction.java

@@ -0,0 +1,32 @@
+/*
+ * 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.integration.crafttweaker.actions;
+
+import java.util.Optional;
+
+/**
+ * An extension of {@link IAction} with a single validation function, rather than two.
+ */
+public interface IAction extends crafttweaker.IAction
+{
+    default Optional<String> getValidationProblem()
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    default boolean validate()
+    {
+        return !getValidationProblem().isPresent();
+    }
+
+    @Override
+    default String describeInvalid()
+    {
+        return getValidationProblem().orElse( "No problems found." );
+    }
+}

src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByItem.java

@@ -0,0 +1,50 @@
+/*
+ * 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.integration.crafttweaker.actions;
+
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.shared.TurtleUpgrades;
+import net.minecraft.item.ItemStack;
+
+import java.util.Optional;
+
+/**
+ * Removes a turtle upgrade crafted with the given stack.
+ */
+public class RemoveTurtleUpgradeByItem implements IAction
+{
+    private final ItemStack stack;
+
+    public RemoveTurtleUpgradeByItem( ItemStack stack )
+    {
+        this.stack = stack;
+    }
+
+    @Override
+    public void apply()
+    {
+        ITurtleUpgrade upgrade = TurtleUpgrades.get( stack );
+        if( upgrade != null ) TurtleUpgrades.disable( upgrade );
+    }
+
+    @Override
+    public String describe()
+    {
+        return String.format( "Remove turtle upgrades crafted with '%s'", stack );
+    }
+
+    @Override
+    public Optional<String> getValidationProblem()
+    {
+        if( TurtleUpgrades.get( stack ) == null )
+        {
+            return Optional.of( String.format( "Unknown turtle upgrade crafted with '%s'.", stack ) );
+        }
+
+        return Optional.empty();
+    }
+}

src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByName.java

@@ -0,0 +1,49 @@
+/*
+ * 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.integration.crafttweaker.actions;
+
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.shared.TurtleUpgrades;
+
+import java.util.Optional;
+
+/**
+ * Removes a turtle upgrade with the given id.
+ */
+public class RemoveTurtleUpgradeByName implements IAction
+{
+    private final String id;
+
+    public RemoveTurtleUpgradeByName( String id )
+    {
+        this.id = id;
+    }
+
+    @Override
+    public void apply()
+    {
+        ITurtleUpgrade upgrade = TurtleUpgrades.get( id );
+        if( upgrade != null ) TurtleUpgrades.disable( upgrade );
+    }
+
+    @Override
+    public String describe()
+    {
+        return String.format( "Remove turtle upgrade '%s'", id );
+    }
+
+    @Override
+    public Optional<String> getValidationProblem()
+    {
+        if( TurtleUpgrades.get( id ) == null )
+        {
+            return Optional.of( String.format( "Unknown turtle upgrade '%s'.", id ) );
+        }
+
+        return Optional.empty();
+    }
+}

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleAxe.java

@@ -7,6 +7,7 @@
 package dan200.computercraft.shared.turtle.upgrades;
 
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 public class TurtleAxe extends TurtleTool
@@ -21,6 +22,11 @@ public class TurtleAxe extends TurtleTool
         super( id, item );
     }
 
+    public TurtleAxe( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
+    {
+        super( id, craftItem, toolItem );
+    }
+
     @Override
     protected float getDamageMultiplier()
     {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java

@@ -35,6 +35,11 @@ public class TurtleHoe extends TurtleTool
         super( id, item );
     }
 
+    public TurtleHoe( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
+    {
+        super( id, craftItem, toolItem );
+    }
+
     @Override
     protected boolean canBreakBlock( BlockState state, World world, BlockPos pos, TurtlePlayer player )
     {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleShovel.java

@@ -35,6 +35,11 @@ public class TurtleShovel extends TurtleTool
         super( id, item );
     }
 
+    public TurtleShovel( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
+    {
+        super( id, craftItem, toolItem );
+    }
+
     @Override
     protected boolean canBreakBlock( BlockState state, World world, BlockPos pos, TurtlePlayer player )
     {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSword.java

@@ -10,6 +10,7 @@ import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -26,6 +27,11 @@ public class TurtleSword extends TurtleTool
         super( id, item );
     }
 
+    public TurtleSword( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
+    {
+        super( id, craftItem, toolItem );
+    }
+
     @Override
     protected boolean canBreakBlock( BlockState state, World world, BlockPos pos, TurtlePlayer player )
     {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java

@@ -63,6 +63,12 @@ public class TurtleTool extends AbstractTurtleUpgrade
         this.item = new ItemStack( item );
     }
 
+    public TurtleTool( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
+    {
+        super( id, -1, TurtleUpgradeType.Tool, craftItem );
+        this.item = toolItem;
+    }
+
     @Nonnull
     @Override
     @OnlyIn( Dist.CLIENT )
@@ -77,7 +83,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
         );
         Minecraft mc = Minecraft.getInstance();
         return Pair.of(
-            mc.getItemRenderer().getItemModelMesher().getItemModel( item ),
+            mc.getItemRenderer().getItemModelMesher().getItemModel( getCraftingItem() ),
             transform
         );
     }