1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-01 10:07:56 +00:00

god forgive me, for I have sinned

This commit is contained in:
Devan-Kerman
2020-09-04 17:29:32 -05:00
parent 0380e60590
commit 33e65e39e3
38 changed files with 2000 additions and 88 deletions

View File

@@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
}
]
}
@@ -29,4 +29,4 @@
"has_the_recipe"
]
]
}
}

View File

@@ -7,14 +7,14 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
}
},
"result": {
"item": "computercraft:cable",
"count": 6
}
}
}

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:ingots/gold"
"tag": "c:gold_ingots"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:computer_advanced"
}
}
}

View File

@@ -6,7 +6,7 @@
"# #"
],
"key": {
"#": { "tag": "forge:ingots/gold" },
"#": { "tag": "c:gold_ingots" },
"C": { "item": "computercraft:computer_normal" }
},
"family": "advanced",

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:ingots/gold"
"tag": "c:gold_ingots"
},
"R": {
"item": "minecraft:command_block"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:computer_command"
}
}
}

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:computer_normal"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:1118481}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:15905484}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:8375321}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:14605932}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:10072818}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:15040472}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:15905331}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:15790320}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:13388876}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:5744206}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:8349260}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:3368652}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:11691749}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:5020082}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:10066329}"
}
}
}

View File

@@ -3,7 +3,7 @@
"group": "computercraft:disk",
"ingredients": [
{
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
{
"item": "minecraft:paper"
@@ -16,4 +16,4 @@
"item": "computercraft:disk",
"nbt": "{color:5000268}"
}
}
}

View File

@@ -7,13 +7,13 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
}
},
"result": {
"item": "computercraft:disk_drive"
}
}
}

View File

@@ -7,14 +7,14 @@
],
"key": {
"#": {
"tag": "forge:ingots/gold"
"tag": "c:gold_ingots"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:monitor_advanced",
"count": 4
}
}
}

View File

@@ -7,13 +7,13 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:monitor_normal"
}
}
}

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:ingots/gold"
"tag": "c:gold_ingots"
},
"A": {
"item": "minecraft:golden_apple"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}
}

View File

@@ -6,7 +6,7 @@
"# #"
],
"key": {
"#": { "tag": "forge:ingots/gold" },
"#": { "tag": "c:gold_ingots" },
"C": { "item": "computercraft:pocket_computer_normal" }
},
"family": "advanced",

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"A": {
"item": "minecraft:golden_apple"
},
"G": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}
}

View File

@@ -7,16 +7,31 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
},
"D": {
"tag": "forge:dyes"
}
"D": [
{"tag": "c:black_dyes"},
{"tag": "c:blue_dyes"},
{"tag": "c:brown_dyes"},
{"tag": "c:cyan_dyes"},
{"tag": "c:gray_dyes"},
{"tag": "c:green_dyes"},
{"tag": "c:light_blue_dyes"},
{"tag": "c:light_gray_dyes"},
{"tag": "c:lime_dyes"},
{"tag": "c:magenta_dyes"},
{"tag": "c:orange_dyes"},
{"tag": "c:pink_dyes"},
{"tag": "c:purple_dyes"},
{"tag": "c:red_dyes"},
{"tag": "c:white_dyes"},
{"tag": "c:yellow_dyes"}
]
},
"result": {
"item": "computercraft:printer"
}
}
}

View File

@@ -7,16 +7,16 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"N": {
"item": "minecraft:note_block"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
}
},
"result": {
"item": "computercraft:speaker"
}
}
}

View File

@@ -6,9 +6,9 @@
"#I#"
],
"key": {
"#": { "tag": "forge:ingots/gold" },
"#": { "tag": "c:gold_ingots" },
"C": { "item": "computercraft:computer_advanced" },
"I": { "tag": "forge:chests/wooden" }
"I": { "tag": "c:wooden_chests" }
},
"family": "advanced",
"result": { "item": "computercraft:turtle_advanced" }

View File

@@ -6,8 +6,8 @@
" B "
],
"key": {
"#": { "tag": "forge:ingots/gold" },
"B": { "tag": "forge:storage_blocks/gold" },
"#": { "tag": "c:gold_ingots" },
"B": { "tag": "c:gold_blocks" },
"C": { "item": "computercraft:turtle_normal" }
},
"family": "advanced",

View File

@@ -6,9 +6,9 @@
"#I#"
],
"key": {
"#": { "tag": "forge:ingots/iron" },
"#": { "tag": "c:iron_ingotsiron" },
"C": { "item": "computercraft:computer_normal" },
"I": { "tag": "forge:chests/wooden" }
"I": { "tag": "c:wooden_chests" }
},
"family": "normal",
"result": { "item": "computercraft:turtle_normal" }

View File

@@ -7,13 +7,13 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"R": {
"tag": "forge:dusts/redstone"
"tag": "c:redstone_dusts"
}
},
"result": {
"item": "computercraft:wired_modem"
}
}
}

View File

@@ -7,7 +7,7 @@
],
"key": {
"#": {
"tag": "forge:ingots/gold"
"tag": "c:gold_ingots"
},
"E": {
"item": "minecraft:ender_eye"
@@ -16,4 +16,4 @@
"result": {
"item": "computercraft:wireless_modem_advanced"
}
}
}

View File

@@ -7,13 +7,13 @@
],
"key": {
"#": {
"tag": "forge:stone"
"tag": "c:stones"
},
"E": {
"tag": "forge:ender_pearls"
"tag": "c:ender_pearls"
}
},
"result": {
"item": "computercraft:wireless_modem_normal"
}
}
}

View File

@@ -0,0 +1,74 @@
package badhtmlparser;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.Iterator;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterators;
import com.google.common.collect.Multimap;
import com.google.common.collect.PeekingIterator;
public class BadHtmlParser {
private static final Multimap<String, String> IDS = HashMultimap.create();
public static void main(String[] args) throws FileNotFoundException {
BufferedReader reader = new BufferedReader(new InputStreamReader(BadHtmlParser.class.getResourceAsStream("/tags.html")));
PeekingIterator<String> iterator = Iterators.peekingIterator(reader.lines()
.iterator());
while (iterator.hasNext()) {
String str = iterator.peek();
try {
int count = Integer.parseInt(str);
iterator.next();
write(iterator, count);
} catch (NumberFormatException e) {
write(iterator, 1);
}
}
System.out.println(IDS);
print("white_dyes");
print("orange_dyes");
print("magenta_dyes");
print("light_blue_dyes");
print("yellow_dyes");
print("lime_dyes");
print("pink_dyes");
print("gray_dyes");
print("light_gray_dyes");
print("cyan_dyes");
print("purple_dyes");
print("blue_dyes");
print("brown_dyes");
print("green_dyes");
print("red_dyes");
print("black_dyes");
// todo replace dyes by hand
}
private static void print(String val) throws FileNotFoundException {
FileOutputStream fos = new FileOutputStream("src/main/resources/data/c/tags/items/" + val + ".json");
PrintStream stream = new PrintStream(fos);
stream.println("{\"replace\": false,\"values\":[");
Iterator<String> iterator = IDS.get("c:" + val)
.iterator();
while (iterator.hasNext()) {
String s = iterator.next();
stream.printf("\"%s\"%s", s, iterator.hasNext() ? ',' : "");
}
stream.println("]}");
}
private static void write(Iterator<String> str, int entries) {
String tag = str.next();
for (int i = 0; i < entries; i++) {
IDS.put(tag, str.next());
}
}
}

1823
src/test/resources/tags.html Normal file

File diff suppressed because it is too large Load Diff