mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 23:28:35 +01:00
Changed some Crafting Recipes
This commit is contained in:
parent
eccc677699
commit
0f6225959f
6 changed files with 16 additions and 12 deletions
|
@ -104,7 +104,9 @@ public enum ConfigCrafting{
|
||||||
BATTERY("Battery", ConfigCategories.ITEMS_CRAFTING),
|
BATTERY("Battery", ConfigCategories.ITEMS_CRAFTING),
|
||||||
|
|
||||||
ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING),
|
ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING);
|
ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
|
|
||||||
|
QUARTZ("Black Quartz in a Crafting Table (as a Backup if there's no Ores to be found anywhere)", ConfigCategories.ITEMS_CRAFTING);
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final String category;
|
public final String category;
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class BlockCrafting{
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
||||||
"WSW", "SRS", "WSW",
|
"WSW", "SRS", "WSW",
|
||||||
'W', "plankWood",
|
'W', "plankWood",
|
||||||
'R', "dustRedstone",
|
'R', "logWood",
|
||||||
'S', "stickWood"));
|
'S', "stickWood"));
|
||||||
|
|
||||||
//Ender Casing
|
//Ender Casing
|
||||||
|
@ -190,7 +190,7 @@ public class BlockCrafting{
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
|
||||||
"WSW", "SRS", "WSW",
|
"WSW", "SRS", "WSW",
|
||||||
'W', "cobblestone",
|
'W', "cobblestone",
|
||||||
'R', "dustRedstone",
|
'R', TheMiscItems.QUARTZ.getOredictName(),
|
||||||
'S', "stickWood"));
|
'S', "stickWood"));
|
||||||
|
|
||||||
//Quartz Block
|
//Quartz Block
|
||||||
|
|
|
@ -16,9 +16,6 @@ public class CrusherCrafting{
|
||||||
public static void init(){
|
public static void init(){
|
||||||
Util.logInfo("Initializing Crusher Recipes...");
|
Util.logInfo("Initializing Crusher Recipes...");
|
||||||
|
|
||||||
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Items.bed), new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.wool, 3), 100);
|
|
||||||
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.wool, 1, Util.WILDCARD), new ItemStack(Items.string, 4));
|
|
||||||
|
|
||||||
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 10));
|
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 10));
|
||||||
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(InitItems.itemDust, 12, TheDusts.LAPIS.ordinal()));
|
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(InitItems.itemDust, 12, TheDusts.LAPIS.ordinal()));
|
||||||
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemDust, 1, TheDusts.COAL.ordinal()));
|
CrusherRecipeManualRegistry.registerRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemDust, 1, TheDusts.COAL.ordinal()));
|
||||||
|
|
|
@ -132,11 +132,17 @@ public class ItemCrafting{
|
||||||
'I', "ingotIron",
|
'I', "ingotIron",
|
||||||
'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
|
'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
|
||||||
|
|
||||||
|
//Quartz
|
||||||
|
if(ConfigCrafting.QUARTZ.isEnabled())
|
||||||
|
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
|
||||||
|
new ItemStack(Items.coal),
|
||||||
|
new ItemStack(Items.quartz)));
|
||||||
|
|
||||||
//Coil
|
//Coil
|
||||||
if(ConfigCrafting.COIL.isEnabled())
|
if(ConfigCrafting.COIL.isEnabled())
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
|
||||||
" R ", "RIR", " R ",
|
" R ", "RIR", " R ",
|
||||||
'I', "ingotIron",
|
'I', TheMiscItems.QUARTZ.getOredictName(),
|
||||||
'R', "dustRedstone"));
|
'R', "dustRedstone"));
|
||||||
|
|
||||||
//Cup
|
//Cup
|
||||||
|
|
|
@ -5,7 +5,6 @@ import ellpeck.actuallyadditions.util.ModUtil;
|
||||||
import ellpeck.actuallyadditions.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
@ -26,7 +25,7 @@ public class CrusherRecipeManualRegistry{
|
||||||
public static void registerRecipe(String input, String outputOne, String outputTwo, int secondChance, int outputOneAmount, int outputTwoAmount){
|
public static void registerRecipe(String input, String outputOne, String outputTwo, int secondChance, int outputOneAmount, int outputTwoAmount){
|
||||||
ArrayList<ItemStack> inputStacks = (ArrayList<ItemStack>)OreDictionary.getOres(input, false);
|
ArrayList<ItemStack> inputStacks = (ArrayList<ItemStack>)OreDictionary.getOres(input, false);
|
||||||
ArrayList<ItemStack> outputOneStacks = (ArrayList<ItemStack>)OreDictionary.getOres(outputOne, false);
|
ArrayList<ItemStack> outputOneStacks = (ArrayList<ItemStack>)OreDictionary.getOres(outputOne, false);
|
||||||
ArrayList<ItemStack> outputTwoStacks = (ArrayList<ItemStack>)OreDictionary.getOres(outputTwo, false);
|
ArrayList<ItemStack> outputTwoStacks = outputTwo.length() <= 0 ? null : (ArrayList<ItemStack>)OreDictionary.getOres(outputTwo, false);
|
||||||
|
|
||||||
if(inputStacks != null && !inputStacks.isEmpty()){
|
if(inputStacks != null && !inputStacks.isEmpty()){
|
||||||
for(ItemStack anInput : inputStacks){
|
for(ItemStack anInput : inputStacks){
|
||||||
|
@ -47,13 +46,13 @@ public class CrusherRecipeManualRegistry{
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled())
|
if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled())
|
||||||
ModUtil.LOGGER.log(Level.WARN, "Couldn't register Crusher Recipe! An Item with OreDictionary Registry '" + outputOne + "' doesn't exist! It should be the output of '" + input + "'!");
|
ModUtil.LOGGER.warn("Couldn't register Crusher Recipe! An Item with OreDictionary Registry '" + outputOne + "' doesn't exist! It should be the output of '" + input + "'!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled())
|
if(ConfigBoolValues.DO_CRUSHER_SPAM.isEnabled())
|
||||||
ModUtil.LOGGER.log(Level.WARN, "Couldn't register Crusher Recipe! Didn't find Items registered as '" + input + "'!");
|
ModUtil.LOGGER.warn("Couldn't register Crusher Recipe! Didn't find Items registered as '"+input+"'!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -420,7 +420,7 @@ tooltip.actuallyadditions.itemMiscDough.desc=Used to make things that involve do
|
||||||
tooltip.actuallyadditions.itemMiscPaperCone.desc=Used to store foodstuffs!
|
tooltip.actuallyadditions.itemMiscPaperCone.desc=Used to store foodstuffs!
|
||||||
tooltip.actuallyadditions.itemMiscKnifeBlade.desc=Sharp like a tooth! A whale's tooth!
|
tooltip.actuallyadditions.itemMiscKnifeBlade.desc=Sharp like a tooth! A whale's tooth!
|
||||||
tooltip.actuallyadditions.itemMiscKnifeHandle.desc=Fits comfortably in your hand.
|
tooltip.actuallyadditions.itemMiscKnifeHandle.desc=Fits comfortably in your hand.
|
||||||
tooltip.actuallyadditions.itemMiscBlackQuartz.desc=Used in the Quartz Enchanter!
|
tooltip.actuallyadditions.itemMiscBlackQuartz.desc=Used for crafting essential components!
|
||||||
tooltip.actuallyadditions.itemMiscRing.desc=Used for crafting Effect Rings
|
tooltip.actuallyadditions.itemMiscRing.desc=Used for crafting Effect Rings
|
||||||
|
|
||||||
tooltip.actuallyadditions.blockMiscWoodCasing.desc=Not so sturdy Casing, used for Crafting
|
tooltip.actuallyadditions.blockMiscWoodCasing.desc=Not so sturdy Casing, used for Crafting
|
||||||
|
|
Loading…
Reference in a new issue