Anvilcraft/icbm
2
1
Fork 0
generated from tilera/1710mod
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: recipes
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Timo Ley 2022-12-18 17:30:44 +01:00
parent c53754af9b
commit abcc79739b
5 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -27,7 +27,7 @@ sourceSets {
api {} api {}
} }
version = "1.0.1" version = "1.0.2"
group = "universalelectricity" group = "universalelectricity"
archivesBaseName = "icbm" archivesBaseName = "icbm"

20
src/main/java/calclavia/lib/UniversalRecipes.java
View file

@ -13,25 +13,25 @@ public class UniversalRecipes {
public static final String PRIMARY_PLATE = "plateSteel"; public static final String PRIMARY_PLATE = "plateSteel";
public static final String SECONDARY_METAL = "ingotBronze"; public static final String SECONDARY_METAL = "ingotBronze";
public static final String SECONDARY_PLATE = "plateBronze"; public static final String SECONDARY_PLATE = "plateBronze";
public static final String CIRCUIT_T1 = "calclavia:CIRCUIT_T1"; public static final String CIRCUIT_T1 = "circuitBasic";
public static final String CIRCUIT_T2 = "calclavia:CIRCUIT_T2"; public static final String CIRCUIT_T2 = "circuitAdvanced";
public static final String CIRCUIT_T3 = "calclavia:CIRCUIT_T3"; public static final String CIRCUIT_T3 = "circuitElite";
public static String ADVANCED_BATTERY = "calclavia:ADVANCED_BATTERY"; public static String ADVANCED_BATTERY = "calclavia:ADVANCED_BATTERY";
public static String BATTERY = "calclavia:BATTERY"; public static String BATTERY = "calclavia:BATTERY";
public static String BATTERY_BOX = "calclavia:BATTERY_BOX"; public static String BATTERY_BOX = "calclavia:BATTERY_BOX";
public static final String WRENCH = "calclavia:WRENCH"; public static final String WRENCH = "calclavia:WRENCH";
public static final String WIRE = "calclavia:WIRE"; public static final String WIRE = "copperWire";
public static final String MOTOR = "calclavia:MOTOR"; public static final String MOTOR = "motor";
public static boolean isInit = false; public static boolean isInit = false;
public static void init() { public static void init() {
if (!isInit) { if (!isInit) {
// TODO: WTF // TODO: WTF
// register("calclavia:CIRCUIT_T1", new Object[]{"circuitBasic", // register("circuitBasic", new Object[]{"circuitBasic",
// Items.getItem("electronicCircuit"), new // Items.getItem("electronicCircuit"), new
// ItemStack(Blocks.redstone_torch)}); register("calclavia:CIRCUIT_T2", // ItemStack(Blocks.redstone_torch)}); register("circuitAdvanced",
// new Object[]{"circuitAdvanced", Items.getItem("advancedCircuit"), new // new Object[]{"circuitAdvanced", Items.getItem("advancedCircuit"), new
// ItemStack(Items.repeater)}); register("calclavia:CIRCUIT_T3", new // ItemStack(Items.repeater)}); register("circuitElite", new
// Object[]{"circuitElite", Items.getItem("iridiumPlate"), new // Object[]{"circuitElite", Items.getItem("iridiumPlate"), new
// ItemStack(Block.field_94346_cn)}); register(ADVANCED_BATTERY, new // ItemStack(Block.field_94346_cn)}); register(ADVANCED_BATTERY, new
// Object[]{"advancedBattery", Items.getItem("energyCrystal"), "battery", // Object[]{"advancedBattery", Items.getItem("energyCrystal"), "battery",
@ -42,9 +42,9 @@ public class UniversalRecipes {
// Items.getItem("batBox"), new ItemStack(Block.field_72105_ah)}); // Items.getItem("batBox"), new ItemStack(Block.field_72105_ah)});
// register("calclavia:WRENCH", new Object[]{"wrench", // register("calclavia:WRENCH", new Object[]{"wrench",
// Items.getItem("wrench"), new ItemStack(Item.field_77708_h)}); // Items.getItem("wrench"), new ItemStack(Item.field_77708_h)});
// register("calclavia:WIRE", new Object[]{"copperWire", // register("copperWire", new Object[]{"copperWire",
// "copperCableBlock", new ItemStack(Item.field_77767_aC)}); // "copperCableBlock", new ItemStack(Item.field_77767_aC)});
// register("calclavia:MOTOR", new Object[]{"motor", // register("motor", new Object[]{"motor",
// Items.getItem("generator"), new ItemStack(Block.field_71963_Z)}); // Items.getItem("generator"), new ItemStack(Block.field_71963_Z)});
isInit = true; isInit = true;
} }

10
src/main/java/icbm/gangshao/ICBMSentry.java
View file

@ -197,11 +197,11 @@ public class ICBMSentry extends MainBase {
'C', 'C',
Blocks.chest, Blocks.chest,
'B', 'B',
"calclavia:CIRCUIT_T1" } "circuitBasic" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMSentry.blockTurret, 1, 0), new ItemStack(ICBMSentry.blockTurret, 1, 0),
new Object[] { "SSS", "CS ", 'C', "calclavia:CIRCUIT_T1", 'S', "ingotSteel" } new Object[] { "SSS", "CS ", 'C', "circuitBasic", 'S', "ingotSteel" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMSentry.blockTurret, 1, 1), new ItemStack(ICBMSentry.blockTurret, 1, 1),
@ -213,7 +213,7 @@ public class ICBMSentry extends MainBase {
'S', 'S',
"plateSteel", "plateSteel",
'C', 'C',
"calclavia:CIRCUIT_T3", "circuitElite",
'G', 'G',
new ItemStack(ICBMSentry.blockTurret, 1, 0) } new ItemStack(ICBMSentry.blockTurret, 1, 0) }
)); ));
@ -227,7 +227,7 @@ public class ICBMSentry extends MainBase {
'S', 'S',
"plateSteel", "plateSteel",
'C', 'C',
"calclavia:CIRCUIT_T2", "circuitAdvanced",
'G', 'G',
new ItemStack(ICBMSentry.blockTurret, 1, 0) } new ItemStack(ICBMSentry.blockTurret, 1, 0) }
)); ));
@ -241,7 +241,7 @@ public class ICBMSentry extends MainBase {
'S', 'S',
"plateSteel", "plateSteel",
'C', 'C',
"calclavia:CIRCUIT_T1", "circuitBasic",
'D', 'D',
Blocks.glass, Blocks.glass,
'G', 'G',

14
src/main/java/icbm/wanyi/ICBMContraption.java
View file

@ -152,14 +152,13 @@ public class ICBMContraption extends MainBase {
"GCG", "GCG",
"WGW", "WGW",
'C', 'C',
"calclavia:CIRCUIT_T1", "circuitBasic",
'G', 'G',
Blocks.glass, Blocks.glass,
'W', 'W',
new ItemStack(Blocks.wool, 1, 32767) } new ItemStack(Blocks.wool, 1, 32767) }
)); ));
if (OreDictionary.getOres(UniversalRecipes.BATTERY).size() > 0) {
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack((Item) ICBMContraption.itTracker), new ItemStack((Item) ICBMContraption.itTracker),
new Object[] { " Z ", new Object[] { " Z ",
@ -168,15 +167,12 @@ public class ICBMContraption extends MainBase {
'Z', 'Z',
Items.compass, Items.compass,
'C', 'C',
"calclavia:CIRCUIT_T1", "circuitBasic",
'B', 'B',
ElectricItemHelper.getUncharged( "battery",
OreDictionary.getOres(UniversalRecipes.BATTERY).get(0)
),
'S', 'S',
"ingotSteel" } "ingotSteel" }
)); ));
}
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMContraption.bGlassPressurePlate, 1, 0), new ItemStack(ICBMContraption.bGlassPressurePlate, 1, 0),
@ -204,9 +200,9 @@ public class ICBMContraption extends MainBase {
'S', 'S',
"ingotSteel", "ingotSteel",
'C', 'C',
"calclavia:CIRCUIT_T1", "circuitBasic",
'W', 'W',
"calclavia:WIRE" } "copperWire" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMContraption.itAntidote, 6), new ItemStack(ICBMContraption.itAntidote, 6),

45
src/main/java/icbm/zhapin/ICBMExplosion.java
View file

@ -2,6 +2,7 @@ package icbm.zhapin;
import java.util.List; import java.util.List;
import basiccomponents.common.BasicComponents;
import calclavia.lib.UniversalRecipes; import calclavia.lib.UniversalRecipes;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
@ -331,7 +332,7 @@ public class ICBMExplosion extends MainBase {
'!', '!',
"ingotSteel", "ingotSteel",
'#', '#',
"calclavia:CIRCUIT_T1", "circuitBasic",
'$', '$',
Blocks.stone_button } Blocks.stone_button }
)); ));
@ -345,7 +346,7 @@ public class ICBMExplosion extends MainBase {
'?', '?',
Items.redstone, Items.redstone,
'#', '#',
"calclavia:CIRCUIT_T2", "circuitAdvanced",
'$', '$',
Blocks.stone_button } Blocks.stone_button }
)); ));
@ -357,7 +358,7 @@ public class ICBMExplosion extends MainBase {
'@', '@',
ElectricItemHelper.getUncharged(ICBMExplosion.itYaoKong), ElectricItemHelper.getUncharged(ICBMExplosion.itYaoKong),
'?', '?',
"calclavia:CIRCUIT_T3", "circuitElite",
'!', '!',
ElectricItemHelper.getUncharged(ICBMExplosion.itLeiDaQiang) } ElectricItemHelper.getUncharged(ICBMExplosion.itLeiDaQiang) }
)); ));
@ -367,16 +368,16 @@ public class ICBMExplosion extends MainBase {
" W ", " W ",
" C", " C",
'C', 'C',
"calclavia:CIRCUIT_T2", "circuitAdvanced",
'W', 'W',
"calclavia:WRENCH", BasicComponents.itemWrench,
'I', 'I',
"calclavia:WIRE" } "copperWire" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 0), new ItemStack(ICBMExplosion.bMachine, 1, 0),
new Object[] { new Object[] {
"! !", "!C!", "!!!", '!', "ingotBronze", 'C', "calclavia:CIRCUIT_T1" } "! !", "!C!", "!!!", '!', "ingotBronze", 'C', "circuitBasic" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 1), new ItemStack(ICBMExplosion.bMachine, 1, 1),
@ -388,7 +389,7 @@ public class ICBMExplosion extends MainBase {
'!', '!',
"ingotSteel", "ingotSteel",
'C', 'C',
"calclavia:CIRCUIT_T2" } "circuitAdvanced" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 2), new ItemStack(ICBMExplosion.bMachine, 1, 2),
@ -400,7 +401,7 @@ public class ICBMExplosion extends MainBase {
'!', '!',
"plateSteel", "plateSteel",
'C', 'C',
"calclavia:CIRCUIT_T3" } "circuitElite" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 3), new ItemStack(ICBMExplosion.bMachine, 1, 3),
@ -408,11 +409,11 @@ public class ICBMExplosion extends MainBase {
"!#!", "!#!",
"!?!", "!?!",
'#', '#',
"calclavia:CIRCUIT_T1", "circuitBasic",
'!', '!',
Blocks.glass, Blocks.glass,
'?', '?',
"calclavia:WIRE" } "copperWire" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 4), new ItemStack(ICBMExplosion.bMachine, 1, 4),
@ -420,11 +421,11 @@ public class ICBMExplosion extends MainBase {
"!#!", "!#!",
"!?!", "!?!",
'#', '#',
"calclavia:CIRCUIT_T2", "circuitAdvanced",
'!', '!',
"ingotSteel", "ingotSteel",
'?', '?',
"calclavia:WIRE", "copperWire",
'$', '$',
new ItemStack(ICBMExplosion.bMachine, 1, 3) } new ItemStack(ICBMExplosion.bMachine, 1, 3) }
)); ));
@ -434,11 +435,11 @@ public class ICBMExplosion extends MainBase {
"!#!", "!#!",
"!?!", "!?!",
'#', '#',
"calclavia:CIRCUIT_T3", "circuitElite",
'!', '!',
Items.gold_ingot, Items.gold_ingot,
'?', '?',
"calclavia:WIRE", "copperWire",
'$', '$',
new ItemStack(ICBMExplosion.bMachine, 1, 4) } new ItemStack(ICBMExplosion.bMachine, 1, 4) }
)); ));
@ -476,7 +477,7 @@ public class ICBMExplosion extends MainBase {
'!', '!',
"plateSteel", "plateSteel",
'#', '#',
"calclavia:CIRCUIT_T1", "circuitBasic",
'?', '?',
Items.gold_ingot } Items.gold_ingot }
)); ));
@ -489,13 +490,13 @@ public class ICBMExplosion extends MainBase {
'?', '?',
"plateSteel", "plateSteel",
'!', '!',
"calclavia:CIRCUIT_T3", "circuitElite",
'@', '@',
UniversalRecipes.BATTERY_BOX, UniversalRecipes.BATTERY_BOX,
'#', '#',
"calclavia:MOTOR", "motor",
'W', 'W',
"calclavia:WIRE" } "copperWire" }
), ),
"EMP Tower", "EMP Tower",
MainBase.CONFIGURATION, MainBase.CONFIGURATION,
@ -522,7 +523,7 @@ public class ICBMExplosion extends MainBase {
'?', '?',
Items.coal, Items.coal,
'#', '#',
"calclavia:CIRCUIT_T1" } "circuitBasic" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 1), new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 1),
@ -532,7 +533,7 @@ public class ICBMExplosion extends MainBase {
'M', 'M',
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 0), new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 0),
'C', 'C',
"calclavia:CIRCUIT_T1", "circuitBasic",
'B', 'B',
"ingotBronze" } "ingotBronze" }
)); ));
@ -546,7 +547,7 @@ public class ICBMExplosion extends MainBase {
'?', '?',
new ItemStack(ICBMExplosion.bExplosives, 1, 0), new ItemStack(ICBMExplosion.bExplosives, 1, 0),
'!', '!',
"calclavia:CIRCUIT_T1" } "circuitBasic" }
)); ));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe( GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 3), new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 3),