Skip to content

Commit

Permalink
Added Ordict support
Browse files Browse the repository at this point in the history 
Thanks to  Techlone
Bump Version
  • Loading branch information
@Dream-Master
Dream-Master committed Feb 11, 2016
1 parent 0eb1422 commit bcf4934
Show file tree
Hide file tree
Showing 38 changed files with 146 additions and 146 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'

version = "1.7.10-1.2.2"
version = "1.7.10-1.3.0"
group= "gttweaker" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "GTTweaker"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gttweaker/GTTweaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import minetweaker.MineTweakerAPI;
import gregtech.api.*;

@Mod(modid = "GTTweaker", name = "GTTweaker", dependencies = "", version = "1.2.2")
@Mod(modid = "GTTweaker", name = "GTTweaker", dependencies = "", version = "1.3.0")
public class GTTweaker {
@EventHandler
public void init(FMLInitializationEvent event) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gttweaker/mods/gregtech/AlloySmelter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class AlloySmelter {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) {
MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick));
}

Expand All @@ -40,12 +40,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient

private static class AddRecipeAction extends OneWayAction {
private final IItemStack output;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) {
public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) {
this.output = output;
this.input1 = input1;
this.input2 = input2;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gttweaker/mods/gregtech/ArcFurnace.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ArcFurnace {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack[]outputs, IIngredient input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack[]outputs, IItemStack input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) {
if (outputs.length < 1) {
MineTweakerAPI.logError("Arc Furnace must have at least 1 output");
} else if(outputs.length!=outChances.length){
Expand All @@ -48,13 +48,13 @@ public static void addRecipe(IItemStack[]outputs, IIngredient input, ILiquidStac
private static class AddRecipeAction extends OneWayAction {

private final IItemStack[] output;
private final IIngredient input;
private final IItemStack input;
private final ILiquidStack fluidInput;
private final int[] chances;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) {
public AddRecipeAction(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) {

this.output = output;
this.input = input;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/gttweaker/mods/gregtech/Assembler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public class Assembler {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int durationTicks, int euPerTick) {
MineTweakerAPI.apply(new AddFluidRecipeAction(output, input1, input2, fluidInput1, durationTicks, euPerTick));
}
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) {
MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick));
}
// ######################
Expand All @@ -48,12 +48,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient
private static class AddRecipeAction extends OneWayAction {

private final IItemStack output;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) {
public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) {

this.output = output;
this.input1 = input1;
Expand Down Expand Up @@ -86,13 +86,13 @@ public Object getOverrideKey() {
private static class AddFluidRecipeAction extends OneWayAction {

private final IItemStack output;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final ILiquidStack fluidInput1;
private final int duration;
private final int euPerTick;

public AddFluidRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int duration, int euPerTick) {
public AddFluidRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int duration, int euPerTick) {

this.output = output;
this.input1 = input1;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gttweaker/mods/gregtech/Autoclave.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class Autoclave {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack fluidInput, int chances, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack output, IItemStack input, ILiquidStack fluidInput, int chances, int durationTicks, int euPerTick) {
MineTweakerAPI.apply(new AddRecipeAction(output, input, fluidInput, chances, durationTicks, euPerTick));
}
// ######################
Expand All @@ -40,13 +40,13 @@ public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack
private static class AddRecipeAction extends OneWayAction {

private final IItemStack output;
private final IIngredient input;
private final IItemStack input;
private final ILiquidStack fluidInput;
private final int chances;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack output, IIngredient input, ILiquidStack fluidInput, int chances, int duration, int euPerTick) {
public AddRecipeAction(IItemStack output, IItemStack input, ILiquidStack fluidInput, int chances, int duration, int euPerTick) {

this.output = output;
this.input = input;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/gttweaker/mods/gregtech/Blastfurnace.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ public class Blastfurnace {
*/

@ZenMethod
public static void addRecipe(IItemStack[]output, ILiquidStack fluidInput, IIngredient[] input, int durationTicks, int euPerTick, int heat) {
public static void addRecipe(IItemStack[]output, ILiquidStack fluidInput, IItemStack[] input, int durationTicks, int euPerTick, int heat) {
if (output.length == 0) {
MineTweakerAPI.logError("Blast furnace recipe requires at least 1 input");
} else {
MineTweakerAPI.apply(new AddFluidRecipeAction(output, fluidInput, input, durationTicks, euPerTick, heat));
}
}
@ZenMethod
public static void addRecipe(IItemStack[] output, IIngredient[] input, int durationTicks, int euPerTick, int heat) {
public static void addRecipe(IItemStack[] output, IItemStack[] input, int durationTicks, int euPerTick, int heat) {
if (output.length == 0) {
MineTweakerAPI.logError("Blast furnace recipe requires at least 1 input");
} else {
Expand All @@ -58,12 +58,12 @@ public static void addRecipe(IItemStack[] output, IIngredient[] input, int durat
private static class AddRecipeAction extends OneWayAction {

private final IItemStack[] output;
private final IIngredient[] input;
private final IItemStack[] input;
private final int duration;
private final int euPerTick;
private final int heat;

public AddRecipeAction(IItemStack[] output, IIngredient[] input, int duration, int euPerTick, int heat) {
public AddRecipeAction(IItemStack[] output, IItemStack[] input, int duration, int euPerTick, int heat) {

this.output = output;
this.input = input;
Expand Down Expand Up @@ -101,12 +101,12 @@ private static class AddFluidRecipeAction extends OneWayAction {

private final IItemStack[] output;
private final ILiquidStack fluidInput;
private final IIngredient[] input;
private final IItemStack[] input;
private final int duration;
private final int euPerTick;
private final int heat;

public AddFluidRecipeAction(IItemStack[] output, ILiquidStack fluidInput, IIngredient[] input, int duration, int euPerTick, int heat) {
public AddFluidRecipeAction(IItemStack[] output, ILiquidStack fluidInput, IItemStack[] input, int duration, int euPerTick, int heat) {

this.output = output;
this.fluidInput = fluidInput;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gttweaker/mods/gregtech/Brewery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class Brewery {
*
*/
@ZenMethod
public static void addRecipe(ILiquidStack fluidOutput, IIngredient Ingredient, ILiquidStack fluidInput, boolean Hidden) {
public static void addRecipe(ILiquidStack fluidOutput, IItemStack Ingredient, ILiquidStack fluidInput, boolean Hidden) {
MineTweakerAPI.apply(new AddRecipeAction(fluidOutput, Ingredient, fluidInput, Hidden));
}

Expand All @@ -41,12 +41,12 @@ public static void addRecipe(ILiquidStack fluidOutput, IIngredient Ingredient, I

private static class AddRecipeAction extends OneWayAction {

private final IIngredient Ingredient;
private final IItemStack Ingredient;
private final ILiquidStack fluidOutput;
private final ILiquidStack fluidInput;
private final boolean Hidden;

public AddRecipeAction(ILiquidStack fluidOutput, IIngredient Ingredient, ILiquidStack fluidInput, boolean Hidden) {
public AddRecipeAction(ILiquidStack fluidOutput, IItemStack Ingredient, ILiquidStack fluidInput, boolean Hidden) {

this.Ingredient = Ingredient;
this.fluidOutput = fluidOutput;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gttweaker/mods/gregtech/Canner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Canner {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) {
MineTweakerAPI.apply(new AddRecipeAction(output, null, input1, input2, durationTicks, euPerTick));
}

Expand All @@ -44,7 +44,7 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack[] output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack[] output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) {
if (output.length == 0) {
MineTweakerAPI.logError("canner requires at least 1 output");
} else {
Expand All @@ -59,12 +59,12 @@ public static void addRecipe(IItemStack[] output, IIngredient input1, IIngredien
private static class AddRecipeAction extends OneWayAction {
private final IItemStack output1;
private final IItemStack output2;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int duration, int euPerTick) {
public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input1, IItemStack input2, int duration, int euPerTick) {

this.output1 = output1;
this.output2 = output2;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/gttweaker/mods/gregtech/Centrifuge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class Centrifuge {
*
*/
@ZenMethod
public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) {
if (outputs.length < 1) {
MineTweakerAPI.logError("Centrifuge must have at least 1 output");
} else if(outputs.length!=chances.length){
Expand All @@ -48,7 +48,7 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIn
}

@ZenMethod
public static void addRecipeFuelCan(IItemStack[] outputs, IIngredient input, int numCans, int duration) {
public static void addRecipeFuelCan(IItemStack[] outputs, IItemStack input, int numCans, int duration) {
if (outputs.length < 1) {
MineTweakerAPI.logError("centrifuge must have at least 1 output");
} else {
Expand All @@ -57,7 +57,7 @@ public static void addRecipeFuelCan(IItemStack[] outputs, IIngredient input, int
}

@ZenMethod
public static void addRecipe(IItemStack[] outputs, IIngredient input, int cells, int durationTicks) {
public static void addRecipe(IItemStack[] outputs, IItemStack input, int cells, int durationTicks) {
if (outputs.length < 1) {
MineTweakerAPI.logError("centrifuge must have at least 1 output");
} else {
Expand All @@ -72,11 +72,11 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int cells,

private static class AddRecipeAction extends OneWayAction {
private final IItemStack[] output;
private final IIngredient input;
private final IItemStack input;
private final int cells;
private final int duration;

public AddRecipeAction(IItemStack[] output, IIngredient input, int cells, int duration) {
public AddRecipeAction(IItemStack[] output, IItemStack input, int cells, int duration) {

this.output = output;
this.input = input;
Expand Down Expand Up @@ -147,14 +147,14 @@ private static class AddFluidRecipeAction extends OneWayAction {

private final IItemStack[] outputs;
private final ILiquidStack fluidOutput;
private final IIngredient input;
private final IIngredient cells;
private final IItemStack input;
private final IItemStack cells;
private final ILiquidStack fluidInput;
private final int [] chances;
private final int duration;
private final int euPerTick;

public AddFluidRecipeAction(IItemStack[] outputs, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) {
public AddFluidRecipeAction(IItemStack[] outputs, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) {

this.outputs = outputs;
this.fluidOutput = fluidOutput;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gttweaker/mods/gregtech/ChemicalBath.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ChemicalBath {
* @param euPerTick eu consumption per tick
*/
@ZenMethod
public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) {
public static void addRecipe(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) {
if (output.length == 0) {
MineTweakerAPI.logError("chemical bath requires at least 1 output");
} else {
Expand All @@ -47,13 +47,13 @@ public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStac
private static class AddRecipeAction extends OneWayAction {

private final IItemStack[] output;
private final IIngredient input;
private final IItemStack input;
private final ILiquidStack fluidInput;
private final int[] chances;
private final int duration;
private final int euPerTick;

public AddRecipeAction(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) {
public AddRecipeAction(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) {

this.output = output;
this.input = input;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/gttweaker/mods/gregtech/ChemicalReactor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ public class ChemicalReactor {
* @param durationTicks reaction time, in ticks
*/
@ZenMethod
public static void addRecipe(IItemStack output, ILiquidStack fluidOutput1, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int durationTicks) {
public static void addRecipe(IItemStack output, ILiquidStack fluidOutput1, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int durationTicks) {
MineTweakerAPI.apply(new AddFluidRecipeAction(output, fluidOutput1, input1, input2, fluidInput1, durationTicks));
}

@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks) {
public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks) {
MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks));
}

Expand All @@ -48,11 +48,11 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient
private static class AddRecipeAction extends OneWayAction {

private final IItemStack output;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final int duration;

public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration) {
public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration) {

this.output = output;
this.input1 = input1;
Expand Down Expand Up @@ -118,12 +118,12 @@ private static class AddFluidRecipeAction extends OneWayAction {

private final IItemStack output;
private final ILiquidStack fluidOutput1;
private final IIngredient input1;
private final IIngredient input2;
private final IItemStack input1;
private final IItemStack input2;
private final ILiquidStack fluidInput1;
private final int duration;

public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput1, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int duration) {
public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput1, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int duration) {

this.output = output;
this.fluidOutput1 = fluidOutput1;
Expand Down
Loading

5 comments on commit bcf4934

@Techlone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added Ordict support

Wait, what? I not added the ore dict support in my previous commits yet. It was just my feature that I started before and it's not applicable to the ore dict support.
Furthermore, you changed IIngredient back. Why?
I can't merge it automatically with my new branch in that I'm making the ore dict support. Of course I resolve it manually but... it's not cool.

@Dream-Master
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because i think i have to because the ingredient thing not work. I am confused now. The best thing is when you make a own wip branch for it because the old version not have ore support but it works. The new one i make witht teh ordict (before your commit) not realy.

@Dream-Master
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Techlone
I can add you as collaborator if you want.

@Techlone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can add you as collaborator if you want.

It's not necessarily. I will fix all things in my fork and after I will push.

@Dream-Master
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok nice. Thanks for get things working.

Please sign in to comment.