mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-01-11 01:40:56 +00:00
f9e13ca67a
Look, I originally had this split into several commits, but lots of
other cleanups got mixed in. I then backported some of the cleanups to
1.12, did other tidy ups there, and eventually the web of merges was
unreadable.
Yes, this is a horrible mess, but it's still nicer than it was. Anyway,
changes:
- Flatten everything. For instance, there are now three instances of
BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no
more BlockPeripheral (thank heavens) - there's separate block classes
for each peripheral type.
- Remove pretty much all legacy code. As we're breaking world
compatibility anyway, we can remove all the code to load worlds from
1.4 days.
- The command system is largely rewriten to take advantage of 1.13's
new system. It's very fancy!
- WidgetTerminal now uses Minecraft's "GUI listener" system.
- BREAKING CHANGE: All the codes in keys.lua are different, due to the
move to LWJGL 3. Hopefully this won't have too much of an impact.
I don't want to map to the old key codes on the Java side, as there
always ends up being small but slight inconsistencies. IMO it's
better to make a clean break - people should be using keys rather
than hard coding the constants anyway.
- commands.list now allows fetching sub-commands. The ROM has already
been updated to allow fancy usage such as commands.time.set("noon").
- Turtles, modems and cables can be waterlogged.
88 lines
2.9 KiB
Java
88 lines
2.9 KiB
Java
/*
|
|
* 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.pocket.IPocketUpgrade;
|
|
import dan200.computercraft.shared.util.InventoryUtil;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraftforge.fml.ModContainer;
|
|
import net.minecraftforge.fml.ModLoadingContext;
|
|
|
|
import javax.annotation.Nonnull;
|
|
import javax.annotation.Nullable;
|
|
import java.util.*;
|
|
|
|
public final class PocketUpgrades
|
|
{
|
|
private static final Map<String, IPocketUpgrade> upgrades = new HashMap<>();
|
|
private static final IdentityHashMap<IPocketUpgrade, String> upgradeOwners = new IdentityHashMap<>();
|
|
|
|
private PocketUpgrades() {}
|
|
|
|
public static synchronized void register( @Nonnull IPocketUpgrade upgrade )
|
|
{
|
|
Objects.requireNonNull( upgrade, "upgrade cannot be null" );
|
|
|
|
String id = upgrade.getUpgradeID().toString();
|
|
IPocketUpgrade existing = upgrades.get( id );
|
|
if( existing != null )
|
|
{
|
|
throw new IllegalStateException( "Error registering '" + upgrade.getUnlocalisedAdjective() + " pocket computer'. UpgradeID '" + id + "' is already registered by '" + existing.getUnlocalisedAdjective() + " pocket computer'" );
|
|
}
|
|
|
|
upgrades.put( id, upgrade );
|
|
|
|
ModContainer mc = ModLoadingContext.get().getActiveContainer();
|
|
if( mc != null && mc.getModId() != null ) upgradeOwners.put( upgrade, mc.getModId() );
|
|
}
|
|
|
|
public static IPocketUpgrade get( String id )
|
|
{
|
|
// Fix a typo in the advanced modem upgrade's name. I'm sorry, I realise this is horrible.
|
|
if( id.equals( "computercraft:advanved_modem" ) ) id = "computercraft:advanced_modem";
|
|
|
|
return upgrades.get( id );
|
|
}
|
|
|
|
public static IPocketUpgrade get( @Nonnull ItemStack stack )
|
|
{
|
|
if( stack.isEmpty() ) return null;
|
|
|
|
for( IPocketUpgrade upgrade : upgrades.values() )
|
|
{
|
|
ItemStack craftingStack = upgrade.getCraftingItem();
|
|
if( !craftingStack.isEmpty() && InventoryUtil.areItemsSimilar( stack, craftingStack ) )
|
|
{
|
|
return upgrade;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
@Nullable
|
|
public static String getOwner( IPocketUpgrade upgrade )
|
|
{
|
|
return upgradeOwners.get( upgrade );
|
|
}
|
|
|
|
public static Iterable<IPocketUpgrade> getVanillaUpgrades()
|
|
{
|
|
List<IPocketUpgrade> vanilla = new ArrayList<>();
|
|
vanilla.add( ComputerCraft.PocketUpgrades.wirelessModemNormal );
|
|
vanilla.add( ComputerCraft.PocketUpgrades.wirelessModemAdvanced );
|
|
vanilla.add( ComputerCraft.PocketUpgrades.speaker );
|
|
return vanilla;
|
|
}
|
|
|
|
public static Iterable<IPocketUpgrade> getUpgrades()
|
|
{
|
|
return Collections.unmodifiableCollection( upgrades.values() );
|
|
}
|
|
}
|