From 9dcb9f9537124f9adf01055d84089da90804671d Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Sun, 10 Oct 2021 08:41:23 +0300 Subject: [PATCH 1/7] fix: ModelTransformer return old code, it was wrong get offset length --- .../client/render/ModelTransformer.java | 39 +++++++------------ 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java index 1556246a1..a14ae9e07 100644 --- a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java +++ b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java @@ -64,36 +64,23 @@ public final class ModelTransformer { for( VertexFormatElement element : format.getElements() ) // For each vertex element { - if( element.isPosition() && - element.getDataType() == VertexFormatElement.DataType.FLOAT && - element.getLength() == 3 ) // When we find a position element + int start = offsetBytes / Integer.BYTES; + if( element.getType() == VertexFormatElement.Type.POSITION && element.getDataType() == VertexFormatElement.DataType.FLOAT ) // When we find a position element { - for ( int j = 0; j < 4; ++j ) // For each corner of the quad - { - int start = offsetBytes + j * format.getVertexSize(); - if ( (start % 4) == 0 ) - { - start = start / 4; + Vector4f pos = new Vector4f( Float.intBitsToFloat( vertexData[start] ), + Float.intBitsToFloat( vertexData[start + 1] ), + Float.intBitsToFloat( vertexData[start + 2] ), + 1 ); - // Extract the position - Vector4f pos = new Vector4f( - Float.intBitsToFloat( vertexData[start] ), - Float.intBitsToFloat( vertexData[start + 1] ), - Float.intBitsToFloat( vertexData[start + 2] ), - 1 - ); + // Transform the position + pos.transform( transform ); - // Transform the position - pos.transform( transform ); - - // Insert the position - vertexData[start] = Float.floatToRawIntBits( pos.getX() ); - vertexData[start + 1] = Float.floatToRawIntBits( pos.getY() ); - vertexData[start + 2] = Float.floatToRawIntBits( pos.getZ() ); - } - } + // Insert the position + vertexData[start] = Float.floatToRawIntBits( pos.getX() ); + vertexData[start + 1] = Float.floatToRawIntBits( pos.getY() ); + vertexData[start + 2] = Float.floatToRawIntBits( pos.getZ() ); } - offsetBytes += element.getLength(); + offsetBytes += element.getByteLength(); } } return copy; From fdbf41b3c48bc8e468729b097ed49de881d49ffa Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Sun, 10 Oct 2021 17:26:25 +0300 Subject: [PATCH 2/7] fix: MixinLanguage remove keys if they exists in vanilla --- .../dan200/computercraft/fabric/mixin/MixinLanguage.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/dan200/computercraft/fabric/mixin/MixinLanguage.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinLanguage.java index fdd5eeeb3..cd053439c 100644 --- a/src/main/java/dan200/computercraft/fabric/mixin/MixinLanguage.java +++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinLanguage.java @@ -22,6 +22,7 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; +import java.util.Map; import java.util.function.BiConsumer; /** @@ -59,6 +60,7 @@ public class MixinLanguage @Inject( method = "create", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At( value = "INVOKE", remap = false, target = "Lcom/google/common/collect/ImmutableMap$Builder;build()Lcom/google/common/collect/ImmutableMap;" ) ) private static void create( CallbackInfoReturnable cir, ImmutableMap.Builder builder ) { + final Map originalTranslation = builder.build(); /* We must ensure that the keys are de-duplicated because we can't catch the error that might otherwise * occur when the injected function calls build() on the ImmutableMap builder. So we use our own hash map and * exclude "minecraft", as the injected function has already loaded those keys at this point. @@ -70,6 +72,9 @@ public class MixinLanguage loadModLangFile( id, translations::put ); } ); + // This is needed to remove keys that exist in vanilla Minecraft (Consistency+ does this) + translations.keySet().removeIf( originalTranslation::containsKey ); + builder.putAll( translations ); } } From ebe847c04bf8cd83390dd230d98781706d9cb8e9 Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Sun, 10 Oct 2021 23:28:07 +0300 Subject: [PATCH 3/7] fix: mouseUp (mouseReleased) event mouseReleased doesn't work at ClickableWidget, why? --- .../dan200/computercraft/client/gui/ComputerScreenBase.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java index 1373bbc61..6ff568413 100644 --- a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java +++ b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java @@ -108,6 +108,12 @@ public abstract class ComputerScreenBase extend return getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ) || super.mouseDragged( x, y, button, deltaX, deltaY ); } + @Override + public boolean mouseReleased( double mouseX, double mouseY, int button ) + { + return (getFocused() != null && getFocused().mouseReleased( mouseX, mouseY, button )) || super.mouseReleased( x, y, button ); + } + @Override protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY ) { From fb274e2ed65a8d41843b008bddb7de2bd821f74a Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Mon, 11 Oct 2021 10:06:15 +0300 Subject: [PATCH 4/7] fix: recipes with nbt it looks like the recipes need to be regenerated --- .../shared/util/ImpostorRecipe.java | 6 +++-- .../shared/util/ImpostorShapelessRecipe.java | 7 +++--- .../computercraft/shared/util/RecipeUtil.java | 25 ++++++++++++++++--- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java b/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java index 92967f1b7..a9e8a3f2f 100644 --- a/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java +++ b/src/main/java/dan200/computercraft/shared/util/ImpostorRecipe.java @@ -29,8 +29,10 @@ public final class ImpostorRecipe extends ShapedRecipe { String group = JsonHelper.getString( json, "group", "" ); ShapedRecipe recipe = RecipeSerializer.SHAPED.read( identifier, json ); - ItemStack result = ShapedRecipe.outputFromJson( JsonHelper.getObject( json, "result" ) ); - return new ImpostorRecipe( identifier, group, recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), result ); + JsonObject resultObject = JsonHelper.getObject( json, "result" ); + ItemStack itemStack = ShapedRecipe.outputFromJson( resultObject ); + RecipeUtil.setNbt( itemStack, resultObject ); + return new ImpostorRecipe( identifier, group, recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), itemStack ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java b/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java index c1fcf7cc9..c2191843a 100644 --- a/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java +++ b/src/main/java/dan200/computercraft/shared/util/ImpostorShapelessRecipe.java @@ -41,9 +41,10 @@ public final class ImpostorShapelessRecipe extends ShapelessRecipe { throw new JsonParseException( "Too many ingredients for shapeless recipe the max is 9" ); } - - ItemStack itemstack = ShapedRecipe.outputFromJson( JsonHelper.getObject( json, "result" ) ); - return new ImpostorShapelessRecipe( id, s, itemstack, ingredients ); + JsonObject resultObject = JsonHelper.getObject( json, "result" ); + ItemStack itemStack = ShapedRecipe.outputFromJson( resultObject ); + RecipeUtil.setNbt( itemStack, resultObject ); + return new ImpostorShapelessRecipe( id, s, itemStack, ingredients ); } private DefaultedList readIngredients( JsonArray arrays ) diff --git a/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java b/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java index 8093458c2..8e07ed89a 100644 --- a/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java +++ b/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java @@ -8,11 +8,11 @@ package dan200.computercraft.shared.util; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; +import com.google.gson.*; +import com.mojang.brigadier.exceptions.CommandSyntaxException; import dan200.computercraft.shared.computer.core.ComputerFamily; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtHelper; import net.minecraft.recipe.Ingredient; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; @@ -24,6 +24,7 @@ import java.util.Set; public final class RecipeUtil { + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); private RecipeUtil() {} public static ShapedTemplate getTemplate( JsonObject json ) @@ -111,6 +112,22 @@ public final class RecipeUtil throw new JsonSyntaxException( "Unknown computer family '" + familyName + "' for field " + name ); } + public static void setNbt( ItemStack itemStack, JsonObject result ) + { + JsonElement nbtElement = result.get( "nbt" ); + if ( nbtElement != null ) + { + try + { + itemStack.setNbt( NbtHelper.method_32260( nbtElement.isJsonObject() ? GSON.toJson( nbtElement ) : nbtElement.getAsString() ) ); + } + catch( CommandSyntaxException e ) + { + throw new JsonSyntaxException( "Invalid NBT entry: " + e.getMessage() ); + } + } + } + public static class ShapedTemplate { public final int width; From 96c80a654952014db0b550299538bbe9440d7b94 Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Mon, 11 Oct 2021 22:49:05 +0300 Subject: [PATCH 5/7] fix: play sounds using Identifier rather than SoundEvent https://github.com/SquidDev-CC/CC-Tweaked/commit/6dd33f7099aea3315f213e44e61ba054b2607fdb --- src/main/java/dan200/computercraft/client/SoundManager.java | 6 +++--- .../shared/network/client/SpeakerPlayClientMessage.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/SoundManager.java b/src/main/java/dan200/computercraft/client/SoundManager.java index d3c67ab5e..fe452eb7d 100644 --- a/src/main/java/dan200/computercraft/client/SoundManager.java +++ b/src/main/java/dan200/computercraft/client/SoundManager.java @@ -10,7 +10,7 @@ import net.minecraft.client.sound.AbstractSoundInstance; import net.minecraft.client.sound.SoundInstance; import net.minecraft.client.sound.TickableSoundInstance; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import java.util.HashMap; @@ -21,7 +21,7 @@ public class SoundManager { private static final Map sounds = new HashMap<>(); - public static void playSound( UUID source, Vec3d position, SoundEvent event, float volume, float pitch ) + public static void playSound( UUID source, Vec3d position, Identifier event, float volume, float pitch ) { var soundManager = MinecraftClient.getInstance().getSoundManager(); @@ -54,7 +54,7 @@ public class SoundManager private static class MoveableSound extends AbstractSoundInstance implements TickableSoundInstance { - protected MoveableSound( SoundEvent sound, Vec3d position, float volume, float pitch ) + protected MoveableSound( Identifier sound, Vec3d position, float volume, float pitch ) { super( sound, SoundCategory.RECORDS ); setPosition( position ); diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java index 97e8d3b69..a913d1ea9 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java @@ -11,7 +11,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.PacketByteBuf; -import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; @@ -67,7 +66,6 @@ public class SpeakerPlayClientMessage implements NetworkMessage @Environment( EnvType.CLIENT ) public void handle( PacketContext context ) { - SoundEvent sound = new SoundEvent( this.sound ); SoundManager.playSound( source, pos, sound, volume, pitch ); } } From 316889dab7ec22dd22877c73c6de1fab68bf611d Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Mon, 11 Oct 2021 22:49:37 +0300 Subject: [PATCH 6/7] fix: recipe util set nbt correct nbt parsing --- .../java/dan200/computercraft/shared/util/RecipeUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java b/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java index 8e07ed89a..167933b8e 100644 --- a/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java +++ b/src/main/java/dan200/computercraft/shared/util/RecipeUtil.java @@ -12,7 +12,7 @@ import com.google.gson.*; import com.mojang.brigadier.exceptions.CommandSyntaxException; import dan200.computercraft.shared.computer.core.ComputerFamily; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NbtHelper; +import net.minecraft.nbt.StringNbtReader; import net.minecraft.recipe.Ingredient; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; @@ -119,7 +119,7 @@ public final class RecipeUtil { try { - itemStack.setNbt( NbtHelper.method_32260( nbtElement.isJsonObject() ? GSON.toJson( nbtElement ) : nbtElement.getAsString() ) ); + itemStack.setNbt( StringNbtReader.parse( nbtElement.isJsonObject() ? GSON.toJson( nbtElement ) : JsonHelper.asString( nbtElement, "nbt" ) ) ); } catch( CommandSyntaxException e ) { From 1832028dfd392fde305843407471cc1eb531fced Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Mon, 11 Oct 2021 22:50:31 +0300 Subject: [PATCH 7/7] fix: remove generated recipes and fix pocket upgrades nbt --- .../recipes/generated/disk/disk_1.json | 10 ---------- .../recipes/generated/disk/disk_10.json | 10 ---------- .../recipes/generated/disk/disk_11.json | 10 ---------- .../recipes/generated/disk/disk_12.json | 10 ---------- .../recipes/generated/disk/disk_13.json | 10 ---------- .../recipes/generated/disk/disk_14.json | 10 ---------- .../recipes/generated/disk/disk_15.json | 10 ---------- .../recipes/generated/disk/disk_16.json | 10 ---------- .../recipes/generated/disk/disk_2.json | 10 ---------- .../recipes/generated/disk/disk_3.json | 10 ---------- .../recipes/generated/disk/disk_4.json | 10 ---------- .../recipes/generated/disk/disk_5.json | 10 ---------- .../recipes/generated/disk/disk_6.json | 10 ---------- .../recipes/generated/disk/disk_7.json | 10 ---------- .../recipes/generated/disk/disk_8.json | 10 ---------- .../recipes/generated/disk/disk_9.json | 10 ---------- .../computercraft_speaker.json | 13 ------------- ...computercraft_wireless_modem_advanced.json | 13 ------------- .../computercraft_wireless_modem_normal.json | 13 ------------- .../pocket_normal/computercraft_speaker.json | 13 ------------- ...computercraft_wireless_modem_advanced.json | 13 ------------- .../computercraft_wireless_modem_normal.json | 13 ------------- .../computercraft_speaker.json | 12 ------------ ...computercraft_wireless_modem_advanced.json | 12 ------------ .../computercraft_wireless_modem_normal.json | 12 ------------ .../minecraft_crafting_table.json | 12 ------------ .../minecraft_diamond_axe.json | 12 ------------ .../minecraft_diamond_hoe.json | 12 ------------ .../minecraft_diamond_pickaxe.json | 12 ------------ .../minecraft_diamond_shovel.json | 12 ------------ .../minecraft_diamond_sword.json | 12 ------------ .../turtle_normal/computercraft_speaker.json | 12 ------------ ...computercraft_wireless_modem_advanced.json | 12 ------------ .../computercraft_wireless_modem_normal.json | 12 ------------ .../minecraft_crafting_table.json | 12 ------------ .../turtle_normal/minecraft_diamond_axe.json | 12 ------------ .../turtle_normal/minecraft_diamond_hoe.json | 12 ------------ .../minecraft_diamond_pickaxe.json | 12 ------------ .../minecraft_diamond_shovel.json | 12 ------------ .../minecraft_diamond_sword.json | 12 ------------ .../computercraft/speaker.json | 3 ++- .../wireless_modem_advanced.json | 3 ++- .../computercraft/wireless_modem_normal.json | 3 ++- .../minecraft/crafting_table.json | 19 ------------------- .../minecraft/diamond_axe.json | 19 ------------------- .../minecraft/diamond_hoe.json | 19 ------------------- .../minecraft/diamond_pickaxe.json | 19 ------------------- .../minecraft/diamond_shovel.json | 19 ------------------- .../minecraft/diamond_sword.json | 19 ------------------- .../pocket_normal/computercraft/speaker.json | 3 ++- .../wireless_modem_advanced.json | 3 ++- .../computercraft/wireless_modem_normal.json | 3 ++- .../minecraft/crafting_table.json | 19 ------------------- .../pocket_normal/minecraft/diamond_axe.json | 19 ------------------- .../pocket_normal/minecraft/diamond_hoe.json | 19 ------------------- .../minecraft/diamond_pickaxe.json | 19 ------------------- .../minecraft/diamond_shovel.json | 19 ------------------- .../minecraft/diamond_sword.json | 19 ------------------- 58 files changed, 12 insertions(+), 688 deletions(-) delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json deleted file mode 100644 index 4688fe0fd..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:black_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 1118481 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json deleted file mode 100644 index 7fda63f5c..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:pink_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15905484 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json deleted file mode 100644 index f986dfbf8..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:lime_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 8375321 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json deleted file mode 100644 index e1d6e7546..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:yellow_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 14605932 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json deleted file mode 100644 index 1651d2915..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:light_blue_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 10072818 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json deleted file mode 100644 index 771dda91c..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:magenta_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15040472 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json deleted file mode 100644 index ded6079af..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:orange_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15905331 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json deleted file mode 100644 index 571f6e3f7..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:white_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15790320 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json deleted file mode 100644 index 5abb3dd15..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:red_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 13388876 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json deleted file mode 100644 index 14c89aecf..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:green_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5744206 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json deleted file mode 100644 index 08ec7369a..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:brown_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 8349260 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json deleted file mode 100644 index c3b669458..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:blue_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 3368652 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json deleted file mode 100644 index f00ca7ce3..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:purple_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 11691749 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json deleted file mode 100644 index 2ee04d222..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:cyan_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5020082 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json deleted file mode 100644 index a2ecd595e..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:light_gray_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 10066329 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json deleted file mode 100644 index c988cb88b..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "item": "minecraft:redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:gray_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5000268 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json deleted file mode 100644 index e60e9ea93..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 878afe1a5..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index 1bd86cca0..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json deleted file mode 100644 index ba569ec7a..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 3c008706d..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 85e7a1d5f..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json deleted file mode 100644 index fe43a6734..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index a6af8052c..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index 564e31980..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json deleted file mode 100644 index 3e44088ca..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json deleted file mode 100644 index 9727781b2..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json deleted file mode 100644 index a36a0b9f5..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json deleted file mode 100644 index 27da4aabd..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json deleted file mode 100644 index 72bc79f11..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json deleted file mode 100644 index 3035c91e0..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json deleted file mode 100644 index 20788c88d..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index b7b7e6ef1..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 5722d7029..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json deleted file mode 100644 index 14c8f23e3..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json deleted file mode 100644 index e0c2104d2..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json deleted file mode 100644 index 981e41774..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json deleted file mode 100644 index 459ca8233..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json deleted file mode 100644 index fc414008b..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json deleted file mode 100644 index 0c2321121..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json index 2ccb7e257..26813f857 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json +++ b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_advanced" + "item": "computercraft:pocket_computer_advanced", + "nbt": "{Upgrade:\"computercraft:speaker\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json index afa233d3f..86b42d9c9 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json +++ b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_advanced" + "item": "computercraft:pocket_computer_advanced", + "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json index dd9795ea3..f0f5ae53f 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json +++ b/src/main/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_advanced" + "item": "computercraft:pocket_computer_advanced", + "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json deleted file mode 100644 index 371696eff..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json deleted file mode 100644 index b92480c56..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json deleted file mode 100644 index bbcbde419..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json deleted file mode 100644 index f76c6b40b..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json deleted file mode 100644 index a2a659f14..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json b/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json deleted file mode 100644 index 4e88fb628..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json index 40456a433..834c82670 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json +++ b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_normal" + "item": "computercraft:pocket_computer_normal", + "nbt": "{Upgrade:\"computercraft:speaker\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json index 7e81e6dd8..732102efe 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json +++ b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_normal" + "item": "computercraft:pocket_computer_normal", + "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json index a59df082c..a7e923bc1 100644 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json +++ b/src/main/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json @@ -14,6 +14,7 @@ } }, "result": { - "item": "computercraft:pocket_computer_normal" + "item": "computercraft:pocket_computer_normal", + "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}" } } diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json deleted file mode 100644 index 17066ab73..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json deleted file mode 100644 index 8ace1eef7..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json deleted file mode 100644 index 18bdc45a3..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json deleted file mode 100644 index 17760518a..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json deleted file mode 100644 index bb950ad10..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json b/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json deleted file mode 100644 index 12235402d..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -}