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

fix: recipes
continuous-integration/drone/push Build is passing Details

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 {}
}
version = "1.0.1"
version = "1.0.2"
group = "universalelectricity"
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 SECONDARY_METAL = "ingotBronze";
public static final String SECONDARY_PLATE = "plateBronze";
public static final String CIRCUIT_T1 = "calclavia:CIRCUIT_T1";
public static final String CIRCUIT_T2 = "calclavia:CIRCUIT_T2";
public static final String CIRCUIT_T3 = "calclavia:CIRCUIT_T3";
public static final String CIRCUIT_T1 = "circuitBasic";
public static final String CIRCUIT_T2 = "circuitAdvanced";
public static final String CIRCUIT_T3 = "circuitElite";
public static String ADVANCED_BATTERY = "calclavia:ADVANCED_BATTERY";
public static String BATTERY = "calclavia:BATTERY";
public static String BATTERY_BOX = "calclavia:BATTERY_BOX";
public static final String WRENCH = "calclavia:WRENCH";
public static final String WIRE = "calclavia:WIRE";
public static final String MOTOR = "calclavia:MOTOR";
public static final String WIRE = "copperWire";
public static final String MOTOR = "motor";
public static boolean isInit = false;
public static void init() {
if (!isInit) {
// TODO: WTF
// register("calclavia:CIRCUIT_T1", new Object[]{"circuitBasic",
// register("circuitBasic", new Object[]{"circuitBasic",
// 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
// ItemStack(Items.repeater)}); register("calclavia:CIRCUIT_T3", new
// ItemStack(Items.repeater)}); register("circuitElite", new
// Object[]{"circuitElite", Items.getItem("iridiumPlate"), new
// ItemStack(Block.field_94346_cn)}); register(ADVANCED_BATTERY, new
// Object[]{"advancedBattery", Items.getItem("energyCrystal"), "battery",
@ -42,9 +42,9 @@ public class UniversalRecipes {
// Items.getItem("batBox"), new ItemStack(Block.field_72105_ah)});
// register("calclavia:WRENCH", new Object[]{"wrench",
// 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)});
// register("calclavia:MOTOR", new Object[]{"motor",
// register("motor", new Object[]{"motor",
// Items.getItem("generator"), new ItemStack(Block.field_71963_Z)});
isInit = true;
}

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

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

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

@ -152,14 +152,13 @@ public class ICBMContraption extends MainBase {
"GCG",
"WGW",
'C',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'G',
Blocks.glass,
'W',
new ItemStack(Blocks.wool, 1, 32767) }
));
if (OreDictionary.getOres(UniversalRecipes.BATTERY).size() > 0) {
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack((Item) ICBMContraption.itTracker),
new Object[] { " Z ",
@ -168,15 +167,12 @@ public class ICBMContraption extends MainBase {
'Z',
Items.compass,
'C',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'B',
ElectricItemHelper.getUncharged(
OreDictionary.getOres(UniversalRecipes.BATTERY).get(0)
),
"battery",
'S',
"ingotSteel" }
));
}
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMContraption.bGlassPressurePlate, 1, 0),
@ -204,9 +200,9 @@ public class ICBMContraption extends MainBase {
'S',
"ingotSteel",
'C',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'W',
"calclavia:WIRE" }
"copperWire" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
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 basiccomponents.common.BasicComponents;
import calclavia.lib.UniversalRecipes;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
@ -331,7 +332,7 @@ public class ICBMExplosion extends MainBase {
'!',
"ingotSteel",
'#',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'$',
Blocks.stone_button }
));
@ -345,7 +346,7 @@ public class ICBMExplosion extends MainBase {
'?',
Items.redstone,
'#',
"calclavia:CIRCUIT_T2",
"circuitAdvanced",
'$',
Blocks.stone_button }
));
@ -357,7 +358,7 @@ public class ICBMExplosion extends MainBase {
'@',
ElectricItemHelper.getUncharged(ICBMExplosion.itYaoKong),
'?',
"calclavia:CIRCUIT_T3",
"circuitElite",
'!',
ElectricItemHelper.getUncharged(ICBMExplosion.itLeiDaQiang) }
));
@ -367,16 +368,16 @@ public class ICBMExplosion extends MainBase {
" W ",
" C",
'C',
"calclavia:CIRCUIT_T2",
"circuitAdvanced",
'W',
"calclavia:WRENCH",
BasicComponents.itemWrench,
'I',
"calclavia:WIRE" }
"copperWire" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 0),
new Object[] {
"! !", "!C!", "!!!", '!', "ingotBronze", 'C', "calclavia:CIRCUIT_T1" }
"! !", "!C!", "!!!", '!', "ingotBronze", 'C', "circuitBasic" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 1),
@ -388,7 +389,7 @@ public class ICBMExplosion extends MainBase {
'!',
"ingotSteel",
'C',
"calclavia:CIRCUIT_T2" }
"circuitAdvanced" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 2),
@ -400,7 +401,7 @@ public class ICBMExplosion extends MainBase {
'!',
"plateSteel",
'C',
"calclavia:CIRCUIT_T3" }
"circuitElite" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 3),
@ -408,11 +409,11 @@ public class ICBMExplosion extends MainBase {
"!#!",
"!?!",
'#',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'!',
Blocks.glass,
'?',
"calclavia:WIRE" }
"copperWire" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.bMachine, 1, 4),
@ -420,11 +421,11 @@ public class ICBMExplosion extends MainBase {
"!#!",
"!?!",
'#',
"calclavia:CIRCUIT_T2",
"circuitAdvanced",
'!',
"ingotSteel",
'?',
"calclavia:WIRE",
"copperWire",
'$',
new ItemStack(ICBMExplosion.bMachine, 1, 3) }
));
@ -434,11 +435,11 @@ public class ICBMExplosion extends MainBase {
"!#!",
"!?!",
'#',
"calclavia:CIRCUIT_T3",
"circuitElite",
'!',
Items.gold_ingot,
'?',
"calclavia:WIRE",
"copperWire",
'$',
new ItemStack(ICBMExplosion.bMachine, 1, 4) }
));
@ -476,7 +477,7 @@ public class ICBMExplosion extends MainBase {
'!',
"plateSteel",
'#',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'?',
Items.gold_ingot }
));
@ -489,13 +490,13 @@ public class ICBMExplosion extends MainBase {
'?',
"plateSteel",
'!',
"calclavia:CIRCUIT_T3",
"circuitElite",
'@',
UniversalRecipes.BATTERY_BOX,
'#',
"calclavia:MOTOR",
"motor",
'W',
"calclavia:WIRE" }
"copperWire" }
),
"EMP Tower",
MainBase.CONFIGURATION,
@ -522,7 +523,7 @@ public class ICBMExplosion extends MainBase {
'?',
Items.coal,
'#',
"calclavia:CIRCUIT_T1" }
"circuitBasic" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 1),
@ -532,7 +533,7 @@ public class ICBMExplosion extends MainBase {
'M',
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 0),
'C',
"calclavia:CIRCUIT_T1",
"circuitBasic",
'B',
"ingotBronze" }
));
@ -546,7 +547,7 @@ public class ICBMExplosion extends MainBase {
'?',
new ItemStack(ICBMExplosion.bExplosives, 1, 0),
'!',
"calclavia:CIRCUIT_T1" }
"circuitBasic" }
));
GameRegistry.addRecipe((IRecipe) new ShapedOreRecipe(
new ItemStack(ICBMExplosion.itTeBieDaoDan, 1, 3),