Skip to content

Commit

Permalink
Make all recipes use the Ore Dictionary
Browse files Browse the repository at this point in the history
  • Loading branch information
@multiplemonomials
multiplemonomials committed Dec 20, 2016
1 parent fef3c3d commit 858e239
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 70 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge' // adds the forge dependency

version = "4.7.3"
version = "4.7.4"
group= "com.buildcraft.additionalpipes" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "additionalpipes"

Expand Down
92 changes: 28 additions & 64 deletions src/main/java/buildcraft/additionalpipes/AdditionalPipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,8 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.MinecraftForge;
import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftSilicon;
import buildcraft.BuildCraftTransport;
Expand Down Expand Up @@ -75,8 +65,17 @@
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.ShapedOreRecipe;

@Mod(modid = AdditionalPipes.MODID, name = AdditionalPipes.NAME, dependencies = "after:BuildCraft|Transport[7.1.5,);after:BuildCraft|Silicon;after:BuildCraft|Transport;after:BuildCraft|Factory;after:LogisticsPipes", version = AdditionalPipes.VERSION)
@Mod(modid = AdditionalPipes.MODID, name = AdditionalPipes.NAME, dependencies = "after:BuildCraft|Transport[7.1.18,);after:BuildCraft|Silicon;after:BuildCraft|Transport;after:BuildCraft|Factory;after:LogisticsPipes", version = AdditionalPipes.VERSION)
public class AdditionalPipes {
public static final String MODID = "additionalpipes";
public static final String NAME = "Additional Pipes";
Expand Down Expand Up @@ -231,11 +230,11 @@ public void init(FMLInitializationEvent event)
blockChunkLoader.setBlockName("teleportTether");
GameRegistry.registerBlock(blockChunkLoader, ItemBlock.class, "chunkLoader");
GameRegistry.registerTileEntity(TileChunkLoader.class, "TeleportTether");
GameRegistry.addRecipe(new ItemStack(blockChunkLoader), new Object[] { "iii", "iLi", "iii", 'i', Items.iron_ingot, 'L', new ItemStack(Items.dye, 1, 4) });
GameRegistry.addRecipe(new ShapedOreRecipe(blockChunkLoader, "iii", "iLi", "ici", 'i', "ingotIron", 'L', "gemLapis", 'c', BuildCraftSilicon.redstoneChipset));

dogDeaggravator = new ItemDogDeaggravator();
GameRegistry.registerItem(dogDeaggravator, ItemDogDeaggravator.NAME);
GameRegistry.addRecipe(new ItemStack(dogDeaggravator), new Object[] { "gsg", "gig", "g g", 'i', Items.iron_ingot, 'g', Items.gold_ingot, 's', Items.stick});
GameRegistry.addRecipe(new ShapedOreRecipe(dogDeaggravator, "gsg", "gig", "g g", 'i', "ingotIron", 'g', "ingotGold", 's', "stickWood"));

Log.info("Running Teleport Manager Tests");
TeleportManagerTest.runAllTests();
Expand Down Expand Up @@ -272,39 +271,7 @@ public void postInit(FMLPostInitializationEvent event) {

success = true;
}

// HOLY CATCH BLOCKS, BATMAN!!!
// I think 8 is a new record
// Java's mandatory exceptions are the worst
catch(NoSuchFieldException e)
{
e.printStackTrace();
}
catch(SecurityException e)
{
e.printStackTrace();
}
catch(ClassNotFoundException e)
{
e.printStackTrace();
}
catch(IllegalArgumentException e)
{
e.printStackTrace();
}
catch(IllegalAccessException e)
{
e.printStackTrace();
}
catch(NoSuchMethodException e)
{
e.printStackTrace();
}
catch(InvocationTargetException e)
{
e.printStackTrace();
}
catch(InstantiationException e)
catch(Exception e)
{
e.printStackTrace();
}
Expand Down Expand Up @@ -355,55 +322,52 @@ private void loadPipes() {
}

//Jeweled Pipe
pipeItemsJeweled = PipeCreator.createPipeAndRecipe(2, PipeItemsJeweled.class, new Object[] { " D ", "DGD", " D ", 'D', BuildCraftTransport.pipeItemsDiamond, 'G', BuildCraftCore.goldGearItem}, false);
pipeItemsJeweled = PipeCreator.createPipeAndRecipe(2, PipeItemsJeweled.class, false, " D ", "DGD", " D ", 'D', BuildCraftTransport.pipeItemsDiamond, 'G', BuildCraftCore.goldGearItem);

// Distributor Pipe
pipeItemsDistributor = PipeCreator.createPipeAndRecipe(1, PipeItemsDistributor.class, new Object[] { " r ", "IgI", 'r', Items.redstone, 'I', Items.iron_ingot, 'g', Blocks.glass }, false);
pipeItemsDistributor = PipeCreator.createPipeAndRecipe(1, PipeItemsDistributor.class, false, " r ", "IgI", 'r', "dustRedstone", 'I', "ingotIron", 'g', "blockGlass");

// Advanced Insertion Pipe
pipeItemsAdvancedInsertion = PipeCreator.createPipeAndRecipe(8, PipeItemsAdvancedInsertion.class,
new Object[] { "IgI", 'I', BuildCraftCore.ironGearItem, 'g', Blocks.glass }, false);
pipeItemsAdvancedInsertion = PipeCreator.createPipeAndRecipe(8, PipeItemsAdvancedInsertion.class, false, "IgI", 'I', BuildCraftCore.ironGearItem, 'g', "blockGlass");

// Advanced Insertion Pipe
pipeItemsAddition = PipeCreator.createPipeAndRecipe(1, PipeItemsAddition.class,
new Object[] { " R ", "RIR", " R ", 'I', pipeItemsAdvancedInsertion, 'R', Items.redstone}, false);
pipeItemsAddition = PipeCreator.createPipeAndRecipe(1, PipeItemsAddition.class, false, " R ", "RIR", " R ", 'I', pipeItemsAdvancedInsertion, 'R', "dustRedstone");

pipeItemsPriority = PipeCreator.createPipeAndRecipe(2, PipeItemsPriorityInsertion.class, new Object[] {pipeItemsDistributor, pipeItemsAdvancedInsertion}, true);
pipeItemsPriority = PipeCreator.createPipeAndRecipe(2, PipeItemsPriorityInsertion.class, true, pipeItemsDistributor, pipeItemsAdvancedInsertion);

// Advanced Wooden Pipe
pipeItemsAdvancedWood = PipeCreator.createPipeAndRecipe(8, PipeItemsAdvancedWood.class, new Object[] { "WgW", 'W', BuildCraftCore.woodenGearItem, 'g', Blocks.glass }, false);
pipeItemsAdvancedWood = PipeCreator.createPipeAndRecipe(8, PipeItemsAdvancedWood.class, false, "WgW", 'W', BuildCraftCore.woodenGearItem, 'g', "blockGlass");

// Gravity Feed Pipe
pipeItemsGravityFeed = PipeCreator.createPipeAndRecipe(1, PipeItemsGravityFeed.class, new Object[] { " ", "IgI", " I ", 'S', Blocks.stone, 'I', Items.iron_ingot, 'g', Blocks.glass }, false);
pipeItemsGravityFeed = PipeCreator.createPipeAndRecipe(1, PipeItemsGravityFeed.class, false, " ", "IgI", " I ", 'S', "stone", 'I', "ingotIron", 'g', "blockGlass");

// Closed Items Pipe
pipeItemsClosed = PipeCreator.createPipeAndRecipe(1, PipeItemsClosed.class, new Object[] {BuildCraftTransport.pipeItemsVoid, BuildCraftCore.ironGearItem}, true);
pipeItemsClosed = PipeCreator.createPipeAndRecipe(1, PipeItemsClosed.class, true, BuildCraftTransport.pipeItemsVoid, BuildCraftCore.ironGearItem);

// switch pipes
pipeItemsSwitch = PipeCreator.createPipeAndRecipe(8, PipeSwitchItems.class, new Object[] { "GgI", 'g', Blocks.glass, 'G', BuildCraftCore.goldGearItem, 'I', BuildCraftCore.ironGearItem}, false);
pipeItemsSwitch = PipeCreator.createPipeAndRecipe(8, PipeSwitchItems.class, false, "GgI", 'g', "blockGlass", 'G', BuildCraftCore.goldGearItem, 'I', BuildCraftCore.ironGearItem);

//set power capacity to the average between iron and gold
int switchPowerCapacity = (PipeTransportPower.powerCapacities.get(PipePowerGold.class) + PipeTransportPower.powerCapacities.get(PipePowerIron.class))/ 2;

PipeTransportPower.powerCapacities.put(PipeSwitchPower.class, switchPowerCapacity);
pipePowerSwitch = PipeCreator.createPipeAndRecipe(1, PipeSwitchPower.class, new Object[] {pipeItemsSwitch, Items.redstone }, true);
pipePowerSwitch = PipeCreator.createPipeAndRecipe(1, PipeSwitchPower.class, true, pipeItemsSwitch, "dustRedstone");

//set fluid capacity to the average between iron and gold
//int switchFluidCapacity = (PipeTransportFluids.fluidCapacities.get(PipeFluidsGold.class) + PipeTransportFluids.fluidCapacities.get(PipeFluidsIron.class))/ 2;
int switchFluidCapacity = PipeTransportFluids.fluidCapacities.get(PipeFluidsGold.class);

PipeTransportFluids.fluidCapacities.put(PipeSwitchFluids.class, switchFluidCapacity);
pipeLiquidsSwitch = PipeCreator.createPipeAndRecipe(1, PipeSwitchFluids.class, new Object[] {pipeItemsSwitch, BuildCraftTransport.pipeWaterproof }, true);
pipeLiquidsSwitch = PipeCreator.createPipeAndRecipe(1, PipeSwitchFluids.class, true, pipeItemsSwitch, BuildCraftTransport.pipeWaterproof);

// water pump pipe
//set fluid capacity
PipeTransportFluids.fluidCapacities.put(PipeLiquidsWaterPump.class, APConfiguration.waterPumpWaterPerTick);
pipeLiquidsWaterPump = PipeCreator.createPipeAndRecipe(1, PipeLiquidsWaterPump.class, new Object[] { " L ", "rPr", " W ", 'r', Items.redstone, 'P', BuildCraftCore.ironGearItem, 'L',
BuildCraftTransport.pipeFluidsGold, 'w', BuildCraftTransport.pipeWaterproof, 'W', BuildCraftTransport.pipeFluidsWood }, false);
pipeLiquidsWaterPump = PipeCreator.createPipeAndRecipe(1, PipeLiquidsWaterPump.class, false, " L ", "rPr", " W ", 'r', "dustRedstone", 'P', BuildCraftCore.ironGearItem, 'L',
BuildCraftTransport.pipeFluidsGold, 'w', BuildCraftTransport.pipeWaterproof, 'W', BuildCraftTransport.pipeFluidsWood);

// obsidian fluid pipe
//set fluid capacity
PipeTransportFluids.fluidCapacities.put(PipeLiquidsObsidian.class, 100);
pipeLiquidsObsidian = PipeCreator.createPipeAndRecipe(1, PipeLiquidsObsidian.class, new Object[] {BuildCraftTransport.pipeItemsObsidian, BuildCraftTransport.pipeWaterproof}, true);
pipeLiquidsObsidian = PipeCreator.createPipeAndRecipe(1, PipeLiquidsObsidian.class, true, BuildCraftTransport.pipeItemsObsidian, BuildCraftTransport.pipeWaterproof);
}

// legacy method
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/buildcraft/additionalpipes/textures/Textures.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package buildcraft.additionalpipes.textures;

import buildcraft.additionalpipes.gui.GuiJeweledPipe;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import buildcraft.additionalpipes.gui.GuiJeweledPipe;

public class Textures {
public static final APActionTriggerIconProvider actionIconProvider = new APActionTriggerIconProvider();
Expand All @@ -29,7 +29,7 @@ public static void registerIcons(IIconRegister iconRegister, int textureType) {
public static final ResourceLocation GUI_ADVANCEDWOOD = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/advancedWoodGui.png");
public static final ResourceLocation GUI_DISTRIBUTION = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/distributionGui.png");
public static final ResourceLocation GUI_PRIORITY = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/priorityGui.png");
public static final ResourceLocation GUI_JEWELED = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/jeweledPipeGui.png");
public static final ResourceLocation GUI_JEWELED = new ResourceLocation("additionalpipes", TEXTURE_PATH + "/gui/guiPipeJeweled.png");

public static final ResourceLocation GUI_OUTLINE_JEWELED[] = new ResourceLocation[GuiJeweledPipe.NUM_TABS];

Expand Down
8 changes: 5 additions & 3 deletions src/main/java/buildcraft/additionalpipes/utils/PipeCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;

public class PipeCreator
{
Expand All @@ -22,7 +24,7 @@ public class PipeCreator
* @param shapeless whether or not the recipe is shapeless
* @return
*/
public static Item createPipeAndRecipe(int output, Class<? extends Pipe<?>> clas, Object[] recipe, boolean shapeless)
public static Item createPipeAndRecipe(int output, Class<? extends Pipe<?>> clas, boolean shapeless, Object... recipe)
{

Item pipe = createPipe(clas);
Expand All @@ -32,11 +34,11 @@ public static Item createPipeAndRecipe(int output, Class<? extends Pipe<?>> clas
}
if(shapeless)
{
GameRegistry.addShapelessRecipe(new ItemStack(pipe, output), recipe);
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(pipe, output), recipe));
}
else
{
GameRegistry.addRecipe(new ItemStack(pipe, output), recipe);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(pipe, output), recipe));
}
return pipe;
}
Expand Down
0 ...onalpipes/textures/gui/JeweledPipeGui.pdn → ...onalpipes/textures/gui/guiPipeJeweled.pdn
View file
File renamed without changes.
0 ...onalpipes/textures/gui/JeweledPipeGui.png → ...onalpipes/textures/gui/guiPipeJeweled.png
View file
File renamed without changes

0 comments on commit 858e239

Please sign in to comment.