mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-09-29 15:30:48 +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.
132 lines
4.3 KiB
Java
132 lines
4.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.common.collect.Maps;
|
|
import com.google.common.collect.Sets;
|
|
import com.google.gson.*;
|
|
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
import net.minecraft.item.crafting.Ingredient;
|
|
import net.minecraft.util.JsonUtils;
|
|
import net.minecraft.util.NonNullList;
|
|
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
// TODO: Replace some things with Forge??
|
|
|
|
public final class RecipeUtil
|
|
{
|
|
private RecipeUtil() {}
|
|
|
|
public static class ShapedTemplate
|
|
{
|
|
public final int width;
|
|
public final int height;
|
|
public final NonNullList<Ingredient> ingredients;
|
|
|
|
public ShapedTemplate( int width, int height, NonNullList<Ingredient> ingredients )
|
|
{
|
|
this.width = width;
|
|
this.height = height;
|
|
this.ingredients = ingredients;
|
|
}
|
|
}
|
|
|
|
public static ShapedTemplate getTemplate( JsonObject json )
|
|
{
|
|
Map<Character, Ingredient> ingMap = Maps.newHashMap();
|
|
for( Map.Entry<String, JsonElement> entry : JsonUtils.getJsonObject( json, "key" ).entrySet() )
|
|
{
|
|
if( entry.getKey().length() != 1 )
|
|
{
|
|
throw new JsonSyntaxException( "Invalid key entry: '" + entry.getKey() + "' is an invalid symbol (must be 1 character only)." );
|
|
}
|
|
if( " ".equals( entry.getKey() ) )
|
|
{
|
|
throw new JsonSyntaxException( "Invalid key entry: ' ' is a reserved symbol." );
|
|
}
|
|
|
|
ingMap.put( entry.getKey().charAt( 0 ), Ingredient.deserialize( entry.getValue() ) );
|
|
}
|
|
|
|
ingMap.put( ' ', Ingredient.EMPTY );
|
|
|
|
JsonArray patternJ = JsonUtils.getJsonArray( json, "pattern" );
|
|
|
|
if( patternJ.size() == 0 )
|
|
{
|
|
throw new JsonSyntaxException( "Invalid pattern: empty pattern not allowed" );
|
|
}
|
|
|
|
String[] pattern = new String[patternJ.size()];
|
|
for( int x = 0; x < pattern.length; x++ )
|
|
{
|
|
String line = JsonUtils.getString( patternJ.get( x ), "pattern[" + x + "]" );
|
|
if( x > 0 && pattern[0].length() != line.length() )
|
|
{
|
|
throw new JsonSyntaxException( "Invalid pattern: each row must be the same width" );
|
|
}
|
|
pattern[x] = line;
|
|
}
|
|
|
|
int width = pattern[0].length();
|
|
int height = pattern.length;
|
|
NonNullList<Ingredient> ingredients = NonNullList.withSize( width * height, Ingredient.EMPTY );
|
|
|
|
Set<Character> missingKeys = Sets.newHashSet( ingMap.keySet() );
|
|
missingKeys.remove( ' ' );
|
|
|
|
int i = 0;
|
|
for( String line : pattern )
|
|
{
|
|
for( char chr : line.toCharArray() )
|
|
{
|
|
Ingredient ing = ingMap.get( chr );
|
|
if( ing == null )
|
|
{
|
|
throw new JsonSyntaxException( "Pattern references symbol '" + chr + "' but it's not defined in the key" );
|
|
}
|
|
ingredients.set( i++, ing );
|
|
missingKeys.remove( chr );
|
|
}
|
|
}
|
|
|
|
if( !missingKeys.isEmpty() )
|
|
{
|
|
throw new JsonSyntaxException( "Key defines symbols that aren't used in pattern: " + missingKeys );
|
|
}
|
|
|
|
return new ShapedTemplate( width, height, ingredients );
|
|
}
|
|
|
|
public static NonNullList<Ingredient> getIngredients( JsonObject json )
|
|
{
|
|
NonNullList<Ingredient> ingredients = NonNullList.create();
|
|
for( JsonElement ele : JsonUtils.getJsonArray( json, "ingredients" ) )
|
|
{
|
|
ingredients.add( Ingredient.deserialize( ele ) );
|
|
}
|
|
|
|
if( ingredients.isEmpty() ) throw new JsonParseException( "No ingredients for recipe" );
|
|
return ingredients;
|
|
}
|
|
|
|
public static ComputerFamily getFamily( JsonObject json, String name )
|
|
{
|
|
String familyName = JsonUtils.getString( json, name );
|
|
try
|
|
{
|
|
return ComputerFamily.valueOf( familyName );
|
|
}
|
|
catch( IllegalArgumentException e )
|
|
{
|
|
throw new JsonSyntaxException( "Unknown computer family '" + familyName + "' for field " + name );
|
|
}
|
|
}
|
|
}
|