1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-18 22:25:12 +00:00
This commit is contained in:
Devan-Kerman
2020-08-29 18:01:01 -05:00
parent 605e1f6b9b
commit 621bc526be
757 changed files with 23755 additions and 74210 deletions

View File

@@ -6,50 +6,54 @@
package dan200.computercraft.shared;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nonnull;
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
{
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" );
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'" );
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 );
upgrades.put(id, upgrade);
}
public static ITurtleUpgrade get( String id )
{
return upgrades.get( id );
public static ITurtleUpgrade get(String id) {
return upgrades.get(id);
}
public static ITurtleUpgrade get( @Nonnull ItemStack stack )
{
if( stack.isEmpty() ) return null;
public static ITurtleUpgrade get(@Nonnull ItemStack stack) {
if (stack.isEmpty()) {
return null;
}
for( ITurtleUpgrade upgrade : upgrades.values() )
{
for (ITurtleUpgrade upgrade : upgrades.values()) {
ItemStack craftingStack = upgrade.getCraftingItem();
if( !craftingStack.isEmpty() && InventoryUtil.areItemsSimilar( stack, craftingStack ) )
{
if (!craftingStack.isEmpty() && InventoryUtil.areItemsSimilar(stack, craftingStack)) {
return upgrade;
}
}
@@ -57,33 +61,30 @@ public final class TurtleUpgrades
return null;
}
public static Iterable<ITurtleUpgrade> getVanillaUpgrades()
{
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.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 );
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 Iterable<ITurtleUpgrade> getUpgrades() {
return Collections.unmodifiableCollection(upgrades.values());
}
public static boolean suitableForFamily( ComputerFamily family, ITurtleUpgrade upgrade )
{
public static boolean suitableForFamily(ComputerFamily family, ITurtleUpgrade upgrade) {
return true;
}
}