mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-24 06:03:28 +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.
107 lines
3.3 KiB
Java
107 lines
3.3 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.google.gson.Gson;
|
|
import com.google.gson.GsonBuilder;
|
|
import com.google.gson.reflect.TypeToken;
|
|
import dan200.computercraft.ComputerCraft;
|
|
import net.minecraft.server.MinecraftServer;
|
|
import net.minecraft.world.dimension.DimensionType;
|
|
import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
|
|
|
import java.io.File;
|
|
import java.io.Reader;
|
|
import java.io.Writer;
|
|
import java.lang.ref.WeakReference;
|
|
import java.lang.reflect.Type;
|
|
import java.nio.charset.StandardCharsets;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
|
|
public final class IDAssigner
|
|
{
|
|
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
|
private static final Type ID_TOKEN = new TypeToken<Map<String, Integer>>() {}.getType();
|
|
|
|
private IDAssigner()
|
|
{
|
|
}
|
|
|
|
private static Map<String, Integer> ids;
|
|
private static WeakReference<MinecraftServer> server;
|
|
private static Path idFile;
|
|
|
|
public static File getDir()
|
|
{
|
|
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
|
|
File worldDirectory = server.getWorld( DimensionType.OVERWORLD ).getSaveHandler().getWorldDirectory();
|
|
return new File( worldDirectory, ComputerCraft.MOD_ID );
|
|
}
|
|
|
|
private static MinecraftServer getCachedServer()
|
|
{
|
|
if( server == null ) return null;
|
|
|
|
MinecraftServer currentServer = server.get();
|
|
if( currentServer == null ) return null;
|
|
|
|
if( currentServer != ServerLifecycleHooks.getCurrentServer() ) return null;
|
|
return currentServer;
|
|
}
|
|
|
|
public static synchronized int getNextId( String kind )
|
|
{
|
|
MinecraftServer currentServer = getCachedServer();
|
|
if( currentServer == null )
|
|
{
|
|
// The server has changed, refetch our ID map
|
|
server = new WeakReference<>( ServerLifecycleHooks.getCurrentServer() );
|
|
|
|
File dir = getDir();
|
|
dir.mkdirs();
|
|
|
|
// Load our ID file from disk
|
|
idFile = new File( dir, "ids.json" ).toPath();
|
|
if( Files.isRegularFile( idFile ) )
|
|
{
|
|
try( Reader reader = Files.newBufferedReader( idFile, StandardCharsets.UTF_8 ) )
|
|
{
|
|
ids = GSON.fromJson( reader, ID_TOKEN );
|
|
}
|
|
catch( Exception e )
|
|
{
|
|
ComputerCraft.log.error( "Cannot load id file '" + idFile + "'", e );
|
|
ids = new HashMap<>();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ids = new HashMap<>();
|
|
}
|
|
}
|
|
|
|
Integer existing = ids.get( kind );
|
|
int next = existing == null ? 0 : existing + 1;
|
|
ids.put( kind, next );
|
|
|
|
// We've changed the ID file, so save it back again.
|
|
try( Writer writer = Files.newBufferedWriter( idFile, StandardCharsets.UTF_8 ) )
|
|
{
|
|
GSON.toJson( ids, writer );
|
|
}
|
|
catch( Exception e )
|
|
{
|
|
ComputerCraft.log.error( "Cannot update ID file '" + idFile + "'", e );
|
|
}
|
|
|
|
return next;
|
|
}
|
|
}
|