Skip to content

GTCE Update for GregicAdditions #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrederikRasmussen wants to merge 4 commits into
base: master
Choose a base branch
from
Open

GTCE Update for GregicAdditions #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d8d127
Fork explanation
FrederikRasmussen May 4, 2019
df941c8
GTCE version updated to 1.8.0.398
May 4, 2019
258f5b1
README.md updated to version from EmosewaPixel/GregicAdditions
May 4, 2019
40c6b11
Merge branch 'master' into EmosewaPixel/GregicAdditions/pr1
FrederikRasmussen May 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ minecraft_version=1.12.2
mod_version=1.4.3
short_version=1.12
stripped_version=1120
ccl_version=3.1.6.339
ccl_version=3.2.2.353
chickenasm_version=1.0.2.9
jei_version=4.9.1.188
multipart_version=2.4.2.58
crafttweaker_version=1.12-4.1.8.9
top_version=1.4.23-16
gt_version=1.7.0.387
gt_version=1.8.0.398
forestry_version=5.8.2.374
gtcebees_version=1.0.3
tconstruct_version=2.12.0.115
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregicadditions/machines/TileEntityCokeOven.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private void finishCurrentRecipe() {
private boolean tryPickNewRecipe() {
ItemStack inputStack = importItems.getStackInSlot(0);
if (inputStack.isEmpty()) return false;
Recipe recipe = GARecipeMaps.COKE_OVEN_RECIPES.findRecipe(Integer.MAX_VALUE, Collections.singletonList(inputStack), Collections.EMPTY_LIST);
Recipe recipe = GARecipeMaps.COKE_OVEN_RECIPES.findRecipe(Integer.MAX_VALUE, Collections.singletonList(inputStack), Collections.EMPTY_LIST, Integer.MAX_VALUE);
if (recipe == null) return false;
NonNullList<ItemStack> outputs = NonNullList.create();
outputs.add(recipe.getOutputs().get(0).copy());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregicadditions/machines/TileEntityDrum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder holder) {
public int getLightOpacity() {
return 1;
}

@Override
public int getActualComparatorValue() {
FluidTank fluidTank = this.fluidTank;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregicadditions/recipes/GAMachineRecipeRemoval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,14 @@ private static void removeRecipesByInputs(RecipeMap map, ItemStack... itemInputs
List<ItemStack> inputs = new ArrayList<>();
for (ItemStack s : itemInputs)
inputs.add(s);
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, inputs, Collections.EMPTY_LIST));
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, inputs, Collections.EMPTY_LIST, Integer.MAX_VALUE));
}

private static void removeRecipesByInputs(RecipeMap map, FluidStack... fluidInputs) {
List<FluidStack> inputs = new ArrayList<>();
for (FluidStack s : fluidInputs)
inputs.add(s);
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, Collections.EMPTY_LIST, inputs));
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, Collections.EMPTY_LIST, inputs, Integer.MAX_VALUE));
}

private static void removeRecipesByInputs(RecipeMap map, ItemStack[] itemInputs, FluidStack[] fluidInputs) {
Expand All @@ -244,7 +244,7 @@ private static void removeRecipesByInputs(RecipeMap map, ItemStack[] itemInputs,
List<FluidStack> fluidIn = new ArrayList<>();
for (FluidStack s : fluidInputs)
fluidIn.add(s);
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, itemIn, fluidIn));
map.removeRecipe(map.findRecipe(Integer.MAX_VALUE, itemIn, fluidIn, Integer.MAX_VALUE));
}

private static void removeAllRecipes(RecipeMap map) {
Expand Down
40 changes: 20 additions & 20 deletions src/main/java/gregicadditions/recipes/GARecipeAddition.java
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions src/main/java/gregicadditions/recipes/GARecipeMaps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ public class GARecipeMaps {
public static final RecipeMap<NoEURecipeBuilder> COKE_OVEN_RECIPES;

static {
CIRCUIT_ASSEMBLER_RECIPES = (new RecipeMap("circuit_assembler", 1, 6, 1, 1, 0, 1, 0, 0, 1, new AssemblerRecipeBuilder())).setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY).setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, ProgressWidget.MoveType.HORIZONTAL);
CLUSTER_MILL_RECIPES = (new RecipeMap("cluster_mill", 1, 1, 1, 1, 0, 0, 0, 0, 1, new SimpleRecipeBuilder())).setSlotOverlay(false, false, GuiTextures.BENDER_OVERLAY).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
CIRCUIT_ASSEMBLER_RECIPES = (new RecipeMap("circuit_assembler", 1, 6, 1, 1, 0, 1, 0, 0, new AssemblerRecipeBuilder())).setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY).setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, ProgressWidget.MoveType.HORIZONTAL);
CLUSTER_MILL_RECIPES = (new RecipeMap("cluster_mill", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder())).setSlotOverlay(false, false, GuiTextures.BENDER_OVERLAY).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
ASSEMBLY_LINE_RECIPES = (new RecipeMapAssemblyLine("assembly_line", 4, 16, 1, 1, 0, 4, 0, 0, 1, new SimpleRecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, ProgressWidget.MoveType.HORIZONTAL);
ASSEMBLY_LINE_RECIPES.setSlotOverlay(false, false, GuiTextures.MOLD_OVERLAY);
NAQUADAH_REACTOR_FUELS = new FuelRecipeMap("naquadah_reactor");
MASS_FAB_RECIPES = (new RecipeMap("mass_fab", 0, 1, 0, 0, 0, 1, 1, 2, 8, new SimpleRecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
REPLICATOR_RECIPES = (new RecipeMap("replicator", 0, 1, 0, 1, 1, 2, 0, 1, 8, new SimpleRecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
COKE_OVEN_RECIPES = new RecipeMap("ga_coke_oven", 1, 1, 0, 1, 0, 0, 0, 1, 0, (new NoEURecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, ProgressWidget.MoveType.HORIZONTAL);
CRACKER_UNIT_RECIPES = new RecipeMap("cracker_unit", 0, 0, 0, 0, 2, 2, 1, 1, 1, (new SimpleRecipeBuilder()).notOptimized());
MASS_FAB_RECIPES = (new RecipeMap("mass_fab", 0, 1, 0, 0, 0, 1, 1, 2, new SimpleRecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
REPLICATOR_RECIPES = (new RecipeMap("replicator", 0, 1, 0, 1, 1, 2, 0, 1, new SimpleRecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL);
COKE_OVEN_RECIPES = new RecipeMap("ga_coke_oven", 1, 1, 0, 1, 0, 0, 0, 1, (new NoEURecipeBuilder())).setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, ProgressWidget.MoveType.HORIZONTAL);
CRACKER_UNIT_RECIPES = new RecipeMap("cracker_unit", 0, 0, 0, 0, 2, 2, 1, 1, (new SimpleRecipeBuilder()));
}
}

2 changes: 1 addition & 1 deletion src/main/java/gregicadditions/recipes/NoEURecipeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public NoEURecipeBuilder copy() {
}

public ValidationResult<Recipe> build() {
return ValidationResult.newResult(this.finalizeAndValidate(), new Recipe(this.inputs, this.outputs, this.chancedOutputs, this.fluidInputs, this.fluidOutputs, ImmutableMap.of(), this.duration, this.EUt, this.hidden, this.canBeBuffered, this.needsEmptyOutput));
return ValidationResult.newResult(this.finalizeAndValidate(), new Recipe(this.inputs, this.outputs, this.chancedOutputs, this.fluidInputs, this.fluidOutputs, ImmutableMap.of(), this.duration, this.EUt, this.hidden, this.needsEmptyOutput));
}

protected EnumValidationResult validate() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregicadditions/recipes/RecipeMapAssemblyLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class RecipeMapAssemblyLine<R extends RecipeBuilder<R>> extends RecipeMap
private ProgressWidget.MoveType moveType;

public RecipeMapAssemblyLine(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, int amperage, R defaultRecipe) {
super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, amperage, defaultRecipe);
super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe);
}

public RecipeMapAssemblyLine<R> setProgressBar(TextureArea progressBar, ProgressWidget.MoveType moveType) {
Expand Down