Skip to content

Commit 6d7777d

Browse files
QuantumBlink1337QuantumBlink1337
authored
Add Non-Vanilla Dye Support to ZTones Blocks within Assembler (#796)
* rewrote ztone recipes to use hashmaps to better support dyes * fixed wildcard imports * reran spotless and clean up * ok actually fixed imports this time
1 parent 63c509d commit 6d7777d

File tree

1 file changed

+66
-41
lines changed

1 file changed

+66
-41
lines changed

‎src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java

+66-41
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
1111
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
1212

13+
import java.util.ArrayList;
14+
import java.util.Arrays;
15+
import java.util.HashMap;
1316
import java.util.List;
17+
import java.util.Map;
1418

1519
import net.minecraft.init.Blocks;
1620
import net.minecraft.init.Items;
@@ -5504,58 +5508,79 @@ private void makeZTonesRecipes() {
55045508
"mint", "myst", "reds", "reed", "roen", "sols", "sync", "tank", "vect", "vena" };
55055509
String[] zblockName = { "zane", "zech", "zest", "zeta", "zion", "zkul", "zoea", "zome", "zone", "zorg", "ztyl",
55065510
"zyth" };
5507-
ItemStack[] item = { new ItemStack(Items.dye, 1, 7), new ItemStack(Items.dye, 1, 4),
5508-
new ItemStack(Blocks.wool, 1, 0), new ItemStack(Blocks.hardened_clay, 1, 0),
5509-
new ItemStack(Items.dye, 1, 3), new ItemStack(Items.dye, 1, 8), new ItemStack(Items.gold_ingot, 1, 0),
5510-
new ItemStack(Blocks.obsidian, 1, 0), new ItemStack(Blocks.soul_sand, 1, 0),
5511-
new ItemStack(Blocks.netherrack, 1, 0), new ItemStack(Blocks.ice, 1, 0),
5512-
new ItemStack(Items.slime_ball, 1, 0), new ItemStack(Blocks.brown_mushroom, 1, 0),
5513-
new ItemStack(Items.redstone, 1, 0), new ItemStack(Items.reeds, 1, 0),
5514-
new ItemStack(Blocks.sandstone, 1, 0), new ItemStack(Items.blaze_powder, 1, 0),
5515-
new ItemStack(Items.emerald, 1, 0), new ItemStack(Items.iron_ingot, 1, 0),
5516-
new ItemStack(Items.ghast_tear, 1, 0), new ItemStack(Items.ender_pearl, 1, 0) };
5517-
ItemStack[] zitem = { new ItemStack(Items.dye, 1, 0), new ItemStack(Items.dye, 1, 1),
5518-
new ItemStack(Items.dye, 1, 2), new ItemStack(Items.dye, 1, 5), new ItemStack(Items.dye, 1, 6),
5519-
new ItemStack(Items.dye, 1, 9), new ItemStack(Items.dye, 1, 10), new ItemStack(Items.dye, 1, 11),
5520-
new ItemStack(Items.dye, 1, 12), new ItemStack(Items.dye, 1, 13), new ItemStack(Items.dye, 1, 14),
5521-
new ItemStack(Items.dye, 1, 15) };
5522-
5523-
for (int j = 0; j < 21; j++) {
5524-
for (int i = 0; i < 16; i++) {
5525-
GT_Values.RA.stdBuilder()
5526-
.itemInputs(
5527-
GT_ModHandler.getModItem(ZTones.ID, "stoneTile", 4L, 0),
5528-
item[j],
5529-
GT_Utility.getIntegratedCircuit(i == 0 ? 24 : i))
5530-
.itemOutputs(GT_ModHandler.getModItem(ZTones.ID, "tile." + blockName[j] + "Block", 8L, i))
5531-
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
5511+
5512+
Map<String, List<ItemStack>> itemMap = new HashMap<>();
5513+
itemMap.put(blockName[0], OreDictionary.getOres("dyeLightGray")); // agon
5514+
itemMap.put(blockName[1], OreDictionary.getOres("dyeBlue")); // azur
5515+
itemMap.put(blockName[2], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.wool, 1, 0)))); // bitt
5516+
itemMap.put(blockName[3], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.hardened_clay, 1, 0)))); // cray
5517+
itemMap.put(blockName[4], OreDictionary.getOres("dyeBrown")); // fort
5518+
itemMap.put(blockName[5], OreDictionary.getOres("dyeGray")); // iszm
5519+
itemMap.put(blockName[6], new ArrayList<>(Arrays.asList(new ItemStack(Items.gold_ingot, 1, 0))));// jelt
5520+
itemMap.put(blockName[7], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.obsidian, 1, 0)))); // korp
5521+
itemMap.put(blockName[8], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.soul_sand, 1, 0))));// kryp
5522+
itemMap.put(blockName[9], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.netherrack, 1, 0))));// lair
5523+
itemMap.put(blockName[10], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.ice, 1, 0))));// lave
5524+
itemMap.put(blockName[11], new ArrayList<>(Arrays.asList(new ItemStack(Items.slime_ball, 1, 0))));// mint
5525+
itemMap.put(blockName[12], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.brown_mushroom, 1, 0))));// myst
5526+
itemMap.put(blockName[13], new ArrayList<>(Arrays.asList(new ItemStack(Items.redstone, 1, 0))));// reds
5527+
itemMap.put(blockName[14], new ArrayList<>(Arrays.asList(new ItemStack(Items.reeds, 1, 0))));// reed
5528+
itemMap.put(blockName[15], new ArrayList<>(Arrays.asList(new ItemStack(Blocks.sandstone, 1, 0))));// roen
5529+
itemMap.put(blockName[16], new ArrayList<>(Arrays.asList(new ItemStack(Items.blaze_powder, 1, 0))));// sols
5530+
itemMap.put(blockName[17], new ArrayList<>(Arrays.asList(new ItemStack(Items.emerald, 1, 0))));// sync
5531+
itemMap.put(blockName[18], new ArrayList<>(Arrays.asList(new ItemStack(Items.iron_ingot, 1, 0))));// tank
5532+
itemMap.put(blockName[19], new ArrayList<>(Arrays.asList(new ItemStack(Items.ghast_tear, 1, 0))));// vect
5533+
itemMap.put(blockName[20], new ArrayList<>(Arrays.asList(new ItemStack(Items.ender_pearl, 1, 0))));// vena
5534+
Map<String, List<ItemStack>> zitemMap = new HashMap<>();
5535+
zitemMap.put(zblockName[0], OreDictionary.getOres("dyeBlack")); // zane
5536+
zitemMap.put(zblockName[1], OreDictionary.getOres("dyeRed")); // zech
5537+
zitemMap.put(zblockName[2], OreDictionary.getOres("dyeBlack")); // zest
5538+
zitemMap.put(zblockName[3], OreDictionary.getOres("dyePurple")); // zeta
5539+
zitemMap.put(zblockName[4], OreDictionary.getOres("dyeCyan")); // zion
5540+
zitemMap.put(zblockName[5], OreDictionary.getOres("dyePink")); // zkul
5541+
zitemMap.put(zblockName[6], OreDictionary.getOres("dyeLime")); // zoea
5542+
zitemMap.put(zblockName[7], OreDictionary.getOres("dyeYellow")); // zome
5543+
zitemMap.put(zblockName[8], OreDictionary.getOres("dyeLightBlue")); // zone
5544+
zitemMap.put(zblockName[9], OreDictionary.getOres("dyeMagenta")); // zorg
5545+
zitemMap.put(zblockName[10], OreDictionary.getOres("dyeOrange")); // ztyl
5546+
zitemMap.put(zblockName[11], OreDictionary.getOres("dyeWhite")); // zyth
5547+
5548+
final int ztoneVariants = 16;
5549+
5550+
for (String name : blockName) {
5551+
for (int i = 0; i < ztoneVariants; i++) {
5552+
for (ItemStack ingredient : itemMap.get(name)) {
5553+
GT_Values.RA.stdBuilder()
5554+
.itemInputs(
5555+
GT_ModHandler.getModItem(ZTones.ID, "stoneTile", 4L, 0),
5556+
ingredient,
5557+
GT_Utility.getIntegratedCircuit(i == 0 ? 24 : i))
5558+
.itemOutputs(GT_ModHandler.getModItem(ZTones.ID, "tile." + name + "Block", 8L, i))
5559+
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
5560+
}
55325561
}
55335562
}
5534-
5535-
for (int j = 0; j < 12; j++) {
5536-
for (int i = 0; i < 16; i++) {
5537-
5538-
GT_Values.RA.stdBuilder()
5539-
.itemInputs(
5540-
GT_ModHandler.getModItem(ZTones.ID, "auroraBlock", 4L, 0),
5541-
zitem[j],
5542-
GT_Utility.getIntegratedCircuit(i == 0 ? 24 : i))
5543-
.itemOutputs(GT_ModHandler.getModItem(ZTones.ID, "tile." + zblockName[j] + "Block", 8L, i))
5544-
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
5545-
5563+
for (String name : zblockName) {
5564+
for (int i = 0; i < ztoneVariants; i++) {
5565+
for (ItemStack ingredient : zitemMap.get(name)) {
5566+
GT_Values.RA.stdBuilder()
5567+
.itemInputs(
5568+
GT_ModHandler.getModItem(ZTones.ID, "auroraBlock", 4L, 0),
5569+
ingredient,
5570+
GT_Utility.getIntegratedCircuit(i == 0 ? 24 : i))
5571+
.itemOutputs(GT_ModHandler.getModItem(ZTones.ID, "tile." + name + "Block", 8L, i))
5572+
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
5573+
}
55465574
}
55475575
}
5548-
5549-
for (int i = 0; i < 16; i++) {
5550-
5576+
for (int i = 0; i < ztoneVariants; i++) {
55515577
GT_Values.RA.stdBuilder()
55525578
.itemInputs(
55535579
GT_ModHandler.getModItem(ZTones.ID, "auroraBlock", 4L, 0),
55545580
new ItemStack(Blocks.glass, 1, 0),
55555581
GT_Utility.getIntegratedCircuit(i == 0 ? 24 : i))
55565582
.itemOutputs(GT_ModHandler.getModItem(ZTones.ID, "tile.glaxx", 8L, i)).duration(10 * SECONDS)
55575583
.eut(16).addTo(assemblerRecipes);
5558-
55595584
}
55605585
}
55615586

0 commit comments

Comments
 (0)