mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-30 17:13:20 +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.
82 lines
2.7 KiB
Java
82 lines
2.7 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.util;
|
|
|
|
import com.mojang.datafixers.DataFixUtils;
|
|
import com.mojang.datafixers.types.Type;
|
|
import dan200.computercraft.ComputerCraft;
|
|
import net.minecraft.tileentity.TileEntity;
|
|
import net.minecraft.tileentity.TileEntityType;
|
|
import net.minecraft.util.ResourceLocation;
|
|
import net.minecraft.util.SharedConstants;
|
|
import net.minecraft.util.datafix.DataFixesManager;
|
|
import net.minecraft.util.datafix.TypeReferences;
|
|
|
|
import java.util.function.Function;
|
|
import java.util.function.Supplier;
|
|
|
|
public final class NamedBlockEntityType<T extends TileEntity> extends TileEntityType<T>
|
|
{
|
|
private final ResourceLocation identifier;
|
|
|
|
private NamedBlockEntityType( ResourceLocation identifier, Supplier<? extends T> supplier )
|
|
{
|
|
super( supplier, getDatafixer( identifier ) );
|
|
this.identifier = identifier;
|
|
setRegistryName( identifier );
|
|
}
|
|
|
|
public static <T extends TileEntity> NamedBlockEntityType<T> create( ResourceLocation identifier, Supplier<? extends T> supplier )
|
|
{
|
|
return new NamedBlockEntityType<>( identifier, supplier );
|
|
}
|
|
|
|
public static <T extends TileEntity> NamedBlockEntityType<T> create( ResourceLocation identifier, Function<NamedBlockEntityType<T>, ? extends T> builder )
|
|
{
|
|
return new FixedPointSupplier<>( identifier, builder ).factory;
|
|
}
|
|
|
|
public ResourceLocation getId()
|
|
{
|
|
return identifier;
|
|
}
|
|
|
|
public static Type<?> getDatafixer( ResourceLocation id )
|
|
{
|
|
try
|
|
{
|
|
return DataFixesManager.getDataFixer()
|
|
.getSchema( DataFixUtils.makeKey( ComputerCraft.DATAFIXER_VERSION ) )
|
|
.getChoiceType( TypeReferences.BLOCK_ENTITY, id.toString() );
|
|
}
|
|
catch( IllegalArgumentException e )
|
|
{
|
|
if( SharedConstants.developmentMode ) throw e;
|
|
ComputerCraft.log.warn( "No data fixer registered for block entity " + id );
|
|
return null;
|
|
}
|
|
}
|
|
|
|
private static final class FixedPointSupplier<T extends TileEntity> implements Supplier<T>
|
|
{
|
|
final NamedBlockEntityType<T> factory;
|
|
private final Function<NamedBlockEntityType<T>, ? extends T> builder;
|
|
|
|
private FixedPointSupplier( ResourceLocation identifier, Function<NamedBlockEntityType<T>, ? extends T> builder )
|
|
{
|
|
factory = create( identifier, this );
|
|
this.builder = builder;
|
|
}
|
|
|
|
@Override
|
|
public T get()
|
|
{
|
|
return builder.apply( factory );
|
|
}
|
|
}
|
|
}
|