From 3d8d127f9c0094bf28d99f046f9bb15131634abe Mon Sep 17 00:00:00 2001 From: FrederikRasmussen Date: Sat, 4 May 2019 10:09:43 +0200 Subject: [PATCH 1/3] Fork explanation --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..1d35a014 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# GregicAdditions +An addon for GregTech Community Edition with the goal of making it much more complicated and realistic through the use of GregTech 5 Unofficial and GregTech 6 features. + +## The Fork +This fork is made exclusively to make an unofficial update to GregBlock to support the currently newest GregTech Community Edition (1.8.0) +The fork was created for the Modded Minecraft Club at: https://www.moddedminecraft.club/ From df941c8187cd08283ac5345690ce6f7dbb6217de Mon Sep 17 00:00:00 2001 From: Frederik Rasmussen Date: Sat, 4 May 2019 12:36:29 +0200 Subject: [PATCH 2/3] GTCE version updated to 1.8.0.398 - updated GTCE version to 1.8.0.398 - updated CodeChicken Lib to 3.2.2.353 - RecipeBuilder::chancedOutput chancedOutput now has an additional parameter, tierChanceBoost, which has been set to 1000. GTCE source code does not seem to use this value for anything yet, but usage inspection revealed values of 700-800. It is likely that a value of 1000 means double per tier, as it used to before the update. UnificationEntry::smeltingMultiplier renamed to UnificationEntry:oreMultiplier Configurable amperage has been removed from recipes ModularUI:setContainerIO renamed to ModularUI:setContainerClicking - TileEntityDrum:getComparatorValue MetaTileEntity now flags this method as final, and it can no longer be overriden. Until GTCE fixes this, comparator functionality is broken. MetaTileEntity:updateComparatorValue no longer takes any arguments MultiblockRecipeMapWorkable renamed to MultiblockRecipeLogic RecipeMapWorkableHandler renamed to AbstractRecipeLogic ValidationResult:newResult no longer has argument related to buffering --- gradle.properties | 4 +- .../machines/TileEntityCokeOven.java | 4 +- .../machines/TileEntityDrum.java | 9 ++-- .../machines/TileEntityFusionReactor.java | 46 +++++++++---------- .../machines/TileEntitySteamMixer.java | 6 +-- .../recipes/GAMachineRecipeRemoval.java | 6 +-- .../recipes/GARecipeAddition.java | 40 ++++++++-------- .../gregicadditions/recipes/GARecipeMaps.java | 13 +++--- .../recipes/NoEURecipeBuilder.java | 2 +- .../recipes/RecipeMapAssemblyLine.java | 2 +- 10 files changed, 67 insertions(+), 65 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2aae0107..7fe93cfe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,13 @@ minecraft_version=1.12.2 mod_version=1.4.2 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.6.3-v1.6.3 +gt_version=1.8.0.398 forestry_version=5.8.2.374 gtcebees_version=1.0.3 tconstruct_version=2.12.0.115 diff --git a/src/main/java/gregicadditions/machines/TileEntityCokeOven.java b/src/main/java/gregicadditions/machines/TileEntityCokeOven.java index e1268756..6d6af2bd 100644 --- a/src/main/java/gregicadditions/machines/TileEntityCokeOven.java +++ b/src/main/java/gregicadditions/machines/TileEntityCokeOven.java @@ -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 outputs = NonNullList.create(); outputs.add(recipe.getOutputs().get(0).copy()); @@ -254,7 +254,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) { .widget(new SlotWidget(exportItems, 0, 85, 24, true, false) .setBackgroundTexture(GuiTextures.BRONZE_SLOT, GATextures.COAL_OVERLAY)) .widget(new TankWidget(exportFluids.getTankAt(0), 102, 23, 18, 18) - .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerIO(true, false)) + .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerClicking(true, false)) .bindPlayerInventory(entityPlayer.inventory, GuiTextures.BRONZE_SLOT) .build(getHolder(), entityPlayer); } diff --git a/src/main/java/gregicadditions/machines/TileEntityDrum.java b/src/main/java/gregicadditions/machines/TileEntityDrum.java index 5edd4da9..4993c529 100644 --- a/src/main/java/gregicadditions/machines/TileEntityDrum.java +++ b/src/main/java/gregicadditions/machines/TileEntityDrum.java @@ -61,14 +61,15 @@ public int getLightOpacity() { return 1; } - @Override + /* Broken by GregTech Community Edition - need to wait for method to be flagged unfinal */ + /*@Override public int getComparatorValue() { FluidTank fluidTank = this.fluidTank; int fluidAmount = fluidTank.getFluidAmount(); int maxCapacity = fluidTank.getCapacity(); float f = fluidAmount / (maxCapacity * 1.0f); return MathHelper.floor(f * 14.0f) + (fluidAmount > 0 ? 1 : 0); - } + }*/ @Override public boolean isOpaqueCube() { @@ -90,7 +91,7 @@ protected void initializeInventory() { super.initializeInventory(); this.fluidTank = new SyncFluidTank(tankSize); this.fluidInventory = fluidTank; - updateComparatorValue(true); + updateComparatorValue(); } @Override @@ -241,7 +242,7 @@ public boolean canFillFluidType(FluidStack fluid) { @Override protected void onFluidChanged(FluidStack newFluidStack, FluidStack oldFluidStack) { - updateComparatorValue(true); + updateComparatorValue(); if (getWorld() != null && !getWorld().isRemote) { onContentsChangedOnServer(newFluidStack, oldFluidStack); } diff --git a/src/main/java/gregicadditions/machines/TileEntityFusionReactor.java b/src/main/java/gregicadditions/machines/TileEntityFusionReactor.java index 9291a580..c8b51efc 100644 --- a/src/main/java/gregicadditions/machines/TileEntityFusionReactor.java +++ b/src/main/java/gregicadditions/machines/TileEntityFusionReactor.java @@ -38,7 +38,7 @@ public class TileEntityFusionReactor extends RecipeMapMultiblockController { public TileEntityFusionReactor(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, RecipeMaps.FUSION_RECIPES); - this.recipeMapWorkable = new MultiblockRecipeMapWorkable(this) { + this.recipeMapWorkable = new MultiblockRecipeLogic(this) { protected int getOverclockingTier(long voltage) { return 0; } @@ -156,42 +156,42 @@ protected void updateFormedValid() { if (this.recipeMapWorkable.isWorkingEnabled()) { if (this.recipeMapWorkable.isHasNotEnoughEnergy()) { - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "progressTime"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "progressTime"); recipeMapWorkable.setMaxProgress(0); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "recipeEUt"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "fluidOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "itemOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "recipeEUt"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "fluidOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "itemOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); return; } - Recipe previousRecipe = ObfuscationReflectionHelper.getPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, "previousRecipe"); + Recipe previousRecipe = ObfuscationReflectionHelper.getPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, "previousRecipe"); this.recipeMapWorkable.updateWorkable(); - Recipe recipe = ObfuscationReflectionHelper.getPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, "previousRecipe"); + Recipe recipe = ObfuscationReflectionHelper.getPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, "previousRecipe"); if (previousRecipe != recipe) { if (recipe != null) { long euToStart = ((Integer) recipe.getProperty("eu_to_start")).intValue(); if (this.energyContainer.getEnergyStored() < euToStart) { - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "progressTime"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "progressTime"); recipeMapWorkable.setMaxProgress(0); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "recipeEUt"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "fluidOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "itemOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "recipeEUt"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "fluidOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "itemOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); } else { this.energyContainer.addEnergy(-euToStart); } } else { - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "progressTime"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "progressTime"); recipeMapWorkable.setMaxProgress(0); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, 0, "recipeEUt"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "fluidOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, null, "itemOutputs"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); - ObfuscationReflectionHelper.setPrivateValue(RecipeMapWorkableHandler.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, 0, "recipeEUt"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "fluidOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, null, "itemOutputs"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, false, "hasNotEnoughEnergy"); + ObfuscationReflectionHelper.setPrivateValue(AbstractRecipeLogic.class, recipeMapWorkable, true, "wasActiveAndNeedsUpdate"); } } } diff --git a/src/main/java/gregicadditions/machines/TileEntitySteamMixer.java b/src/main/java/gregicadditions/machines/TileEntitySteamMixer.java index 8800bf9f..97664a70 100644 --- a/src/main/java/gregicadditions/machines/TileEntitySteamMixer.java +++ b/src/main/java/gregicadditions/machines/TileEntitySteamMixer.java @@ -61,15 +61,15 @@ public ModularUI createUI(EntityPlayer player) { .widget(new SlotWidget(this.importItems, 3, 54, 43) .setBackgroundTexture(BRONZE_SLOT_BACKGROUND_TEXTURE)) .widget(new TankWidget(this.importFluids.getTankAt(1), 18, 24, 18, 18) - .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerIO(false, true)) + .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerClicking(false, true)) .widget(new TankWidget(this.importFluids.getTankAt(2), 18, 42, 18, 18) - .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerIO(false, true)) + .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerClicking(false, true)) .widget(new ProgressWidget(workableHandler::getProgressPercent, 78, 34, 20, 16) .setProgressBar(getFullGuiTexture("progress_bar_%s_furnace"), getFullGuiTexture("progress_bar_%s_furnace_filled"), ProgressWidget.MoveType.HORIZONTAL)) .widget(new TankWidget(this.exportFluids.getTankAt(0), 104, 33, 18, 18) - .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerIO(true, false)) + .setBackgroundTexture(GATextures.BRONZE_FLUID_SLOT).setAlwaysShowFull(true).setContainerClicking(true, false)) .build(getHolder(), player); } } diff --git a/src/main/java/gregicadditions/recipes/GAMachineRecipeRemoval.java b/src/main/java/gregicadditions/recipes/GAMachineRecipeRemoval.java index de11f8f0..7181396b 100644 --- a/src/main/java/gregicadditions/recipes/GAMachineRecipeRemoval.java +++ b/src/main/java/gregicadditions/recipes/GAMachineRecipeRemoval.java @@ -226,14 +226,14 @@ private static void removeRecipesByInputs(RecipeMap map, ItemStack... itemInputs List 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 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) { @@ -243,7 +243,7 @@ private static void removeRecipesByInputs(RecipeMap map, ItemStack[] itemInputs, List 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) { diff --git a/src/main/java/gregicadditions/recipes/GARecipeAddition.java b/src/main/java/gregicadditions/recipes/GARecipeAddition.java index 2b56b96d..f1471238 100644 --- a/src/main/java/gregicadditions/recipes/GARecipeAddition.java +++ b/src/main/java/gregicadditions/recipes/GARecipeAddition.java @@ -166,7 +166,7 @@ public static void init() { ModHandler.addSmeltingRecipe(GAMetaItems.COMPRESSED_FIRECLAY.getStackForm(), GAMetaItems.FIRECLAY_BRICK.getStackForm()); RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().input(OrePrefix.dust, Materials.Fireclay).outputs(GAMetaItems.COMPRESSED_FIRECLAY.getStackForm()).duration(100).EUt(2).buildAndRegister(); ModHandler.addShapedRecipe("quartz_sand", OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand), "S", "m", 'S', "sand"); - RecipeMaps.MACERATOR_RECIPES.recipeBuilder().duration(200).EUt(8).input("sand", 1).outputs(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand)).chancedOutput(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand), 2500).chancedOutput(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand), 2000).buildAndRegister(); + RecipeMaps.MACERATOR_RECIPES.recipeBuilder().duration(200).EUt(8).input("sand", 1).outputs(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand)).chancedOutput(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand), 2500, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.dust, GAMaterials.QuartzSand), 2000, 1000).buildAndRegister(); ModHandler.addShapelessRecipe("glass_dust_ga", OreDictUnifier.get(OrePrefix.dust, Materials.Glass), "dustSand", "dustFlint"); RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(200).EUt(8).input(OrePrefix.dust, Materials.Flint).input(OrePrefix.dust, GAMaterials.QuartzSand, 4).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Glass, 4)).buildAndRegister(); RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(160).EUt(8).input(OrePrefix.dust, Materials.Flint).input(OrePrefix.dust, Materials.Quartzite, 4).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Glass, 4)).buildAndRegister(); @@ -647,14 +647,14 @@ public static void init() { RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16).fluidInputs(Materials.Polytetrafluoroethylene.getFluid(36)).notConsumable(MetaItems.SHAPE_MOLD_CYLINDER.getStackForm()).outputs(GAMetaItems.PETRI_DISH.getStackForm()).buildAndRegister(); RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).inputs(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm()).input(OrePrefix.plate, Materials.Emerald).fluidInputs(Materials.Helium.getFluid(1000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm()).buildAndRegister(); RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).inputs(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm()).input(OrePrefix.plate, Materials.Olivine).fluidInputs(Materials.Helium.getFluid(1000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm()).buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(300).EUt(1024).inputs(new ItemStack(Items.EGG)).chancedOutput(GAMetaItems.STEMCELLS.getStackForm(), 500).buildAndRegister(); + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(300).EUt(1024).inputs(new ItemStack(Items.EGG)).chancedOutput(GAMetaItems.STEMCELLS.getStackForm(), 500, 1000).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(30).input(OrePrefix.dust, Materials.Iron).fluidInputs(Materials.HydrochloricAcid.getFluid(2000)).fluidOutputs(GAMaterials.IronChloride.getFluid(3000), Materials.Hydrogen.getFluid(3000)).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(1920).inputs(MetaItems.CENTRAL_PROCESSING_UNIT_WAFER.getStackForm(), MetaItems.CARBON_FIBERS.getStackForm(16)).fluidInputs(Materials.Glowstone.getFluid(576)).outputs(MetaItems.NANO_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).buildAndRegister(); //Circuit Rabbit Hole - Layer 4 - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).inputs(OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Olivine)).fluidInputs(Materials.Europium.getFluid(16)).chancedOutput(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000).buildAndRegister(); - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).inputs(OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald)).fluidInputs(Materials.Europium.getFluid(16)).chancedOutput(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000).buildAndRegister(); - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(150).EUt(6).input(OrePrefix.dust, Materials.Carbon).fluidInputs(Materials.Lutetium.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 3333).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).inputs(OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Olivine)).fluidInputs(Materials.Europium.getFluid(16)).chancedOutput(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000, 1000).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).inputs(OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald)).fluidInputs(Materials.Europium.getFluid(16)).chancedOutput(GAMetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000, 1000).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(150).EUt(6).input(OrePrefix.dust, Materials.Carbon).fluidInputs(Materials.Lutetium.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 3333, 1000).buildAndRegister(); RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(10000).inputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm()).notConsumable(OrePrefix.craftingLens, MarkerMaterials.Color.Lime).outputs(MetaItems.CRYSTAL_CENTRAL_PROCESSING_UNIT.getStackForm()).buildAndRegister(); RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(160).EUt(16).inputs(new ItemStack(Items.SUGAR, 4), OreDictUnifier.get(OrePrefix.dust, GAMaterials.Meat), OreDictUnifier.get(OrePrefix.dustTiny, Materials.Salt)).fluidInputs(Materials.DistilledWater.getFluid(4000)).fluidOutputs(GAMaterials.RawGrowthMedium.getFluid(4000)).buildAndRegister(); RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(9000).EUt(120).blastFurnaceTemp(1784).input(OrePrefix.dust, Materials.Silicon, 32).input(OrePrefix.dustSmall, Materials.GalliumArsenide).outputs(MetaItems.SILICON_BOULE.getStackForm()).buildAndRegister(); @@ -1198,19 +1198,19 @@ public static void init2() { RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(160).EUt(4).inputs(new ItemStack(Items.PAPER), new ItemStack(Items.STRING)).fluidInputs(Materials.Glyceryl.getFluid(500)).outputs(MetaItems.DYNAMITE.getStackForm()).buildAndRegister(); //Electromagnetic Separator Recipes - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.BrownLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.BrownLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.YellowLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.YellowLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Nickel).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Nickel)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Pentlandite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Pentlandite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.BandedIron).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.BandedIron)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Ilmenite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Ilmenite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Pyrite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Pyrite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Tin).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Tin)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Chromite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Chromite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Monazite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Monazite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Neodymium), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Neodymium), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Bastnasite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Bastnasite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Neodymium), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Neodymium), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.VanadiumMagnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.VanadiumMagnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000).buildAndRegister(); - RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Magnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Magnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.BrownLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.BrownLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.YellowLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.YellowLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Nickel).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Nickel)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Pentlandite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Pentlandite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.BandedIron).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.BandedIron)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Ilmenite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Ilmenite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Pyrite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Pyrite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Tin).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Tin)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Chromite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Chromite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Monazite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Monazite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Neodymium), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Neodymium), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Bastnasite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Bastnasite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Neodymium), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Neodymium), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.VanadiumMagnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.VanadiumMagnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000, 1000).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Magnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Magnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000, 1000).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000, 1000).buildAndRegister(); //Lapotron Crystal Recipes ModHandler.removeRecipes(MetaItems.LAPOTRON_CRYSTAL.getStackForm()); @@ -1251,8 +1251,8 @@ public static void init2() { ModHandler.addShapedRecipe("hoe_head_" + material.toString(), OreDictUnifier.get(OrePrefix.toolHeadHoe, material), "GGf", 'G', new UnificationEntry(OrePrefix.gem, material)); ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.toolHeadPickaxe, material)); ModHandler.addShapedRecipe("pickaxe_head_" + material.toString(), OreDictUnifier.get(OrePrefix.toolHeadPickaxe, material), "GGG", "f ", 'G', new UnificationEntry(OrePrefix.gem, material)); - ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.toolHeadPlow, material)); - ModHandler.addShapedRecipe("flow_head_" + material.toString(), OreDictUnifier.get(OrePrefix.toolHeadPlow, material), "GG", "GG", " f", 'G', new UnificationEntry(OrePrefix.gem, material)); + ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.toolHeadHoe, material)); + ModHandler.addShapedRecipe("flow_head_" + material.toString(), OreDictUnifier.get(OrePrefix.toolHeadHoe, material), "GG", "GG", " f", 'G', new UnificationEntry(OrePrefix.gem, material)); ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.toolHeadSaw, material)); ModHandler.addShapedRecipe("saw_head_" + material.toString(), OreDictUnifier.get(OrePrefix.toolHeadSaw, material), "GG", "f ", 'G', new UnificationEntry(OrePrefix.gem, material)); ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.toolHeadSense, material)); diff --git a/src/main/java/gregicadditions/recipes/GARecipeMaps.java b/src/main/java/gregicadditions/recipes/GARecipeMaps.java index 0e104ba3..aa82e7ef 100644 --- a/src/main/java/gregicadditions/recipes/GARecipeMaps.java +++ b/src/main/java/gregicadditions/recipes/GARecipeMaps.java @@ -21,14 +21,15 @@ public class GARecipeMaps { public static final RecipeMap 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())); } } + \ No newline at end of file diff --git a/src/main/java/gregicadditions/recipes/NoEURecipeBuilder.java b/src/main/java/gregicadditions/recipes/NoEURecipeBuilder.java index da2ea2d3..e102e3ea 100644 --- a/src/main/java/gregicadditions/recipes/NoEURecipeBuilder.java +++ b/src/main/java/gregicadditions/recipes/NoEURecipeBuilder.java @@ -26,7 +26,7 @@ public NoEURecipeBuilder copy() { } public ValidationResult 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() { diff --git a/src/main/java/gregicadditions/recipes/RecipeMapAssemblyLine.java b/src/main/java/gregicadditions/recipes/RecipeMapAssemblyLine.java index 4690e59e..78d6cfd4 100644 --- a/src/main/java/gregicadditions/recipes/RecipeMapAssemblyLine.java +++ b/src/main/java/gregicadditions/recipes/RecipeMapAssemblyLine.java @@ -17,7 +17,7 @@ public class RecipeMapAssemblyLine> 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 setProgressBar(TextureArea progressBar, ProgressWidget.MoveType moveType) { From 258f5b125f1eb85797ddbf811cd6c81b544930d5 Mon Sep 17 00:00:00 2001 From: Frederik Rasmussen Date: Sat, 4 May 2019 12:49:25 +0200 Subject: [PATCH 3/3] README.md updated to version from EmosewaPixel/GregicAdditions --- README.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 1d35a014..00000000 --- a/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# GregicAdditions -An addon for GregTech Community Edition with the goal of making it much more complicated and realistic through the use of GregTech 5 Unofficial and GregTech 6 features. - -## The Fork -This fork is made exclusively to make an unofficial update to GregBlock to support the currently newest GregTech Community Edition (1.8.0) -The fork was created for the Modded Minecraft Club at: https://www.moddedminecraft.club/