Update 900

ReikaKalseki · May 15, 2020 · 424a900 · 424a900
1 parent 2a9feab
commit 424a900
Show file tree

Hide file tree

Showing 31 changed files with 421 additions and 14 deletions.
diff --git a/Auxiliary/RecipeManagers/CastingRecipe.java b/Auxiliary/RecipeManagers/CastingRecipe.java
@@ -487,6 +487,10 @@ public boolean canBeSimpleAutomated() {
 		return false;
 	}
 
+	public boolean canGiveDoubleOutput() {
+		return false;
+	}
+
 	public int getInputCount() {
 		return ReikaRecipeHelper.getRecipeIngredientCount(recipe);
 	}

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/CompoundRuneRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/CompoundRuneRecipe.java
@@ -63,6 +63,11 @@ public final boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	@Override
 	public int getTypicalCraftedAmount() {
 		return 32;

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/EnhancedRuneRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/EnhancedRuneRecipe.java
@@ -39,4 +39,9 @@ public int getNumberProduced() {
 		return 8;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/FloatingRelayRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/FloatingRelayRecipe.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * @author Reika Kalseki
- * 
+ *
  * Copyright 2017
- * 
+ *
  * All rights reserved.
  * Distribution of the software in any form is only allowed with
  * explicit, prior permission from the owner.
@@ -31,4 +31,9 @@ public FloatingRelayRecipe(ItemStack out, ItemStack main) {
 		this.addAuxItem(ChromaStacks.enderDust, 0, -2);
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/RelayRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/RelayRecipe.java
@@ -42,4 +42,9 @@ public int getNumberProduced() {
 		return 8;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/RuneRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/RuneRecipe.java
@@ -48,4 +48,9 @@ protected void getRequiredProgress(Collection<ProgressStage> c) {
 		c.add(ProgressStage.ALLCOLORS);
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Blocks/StoneRuneRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Blocks/StoneRuneRecipe.java
@@ -39,4 +39,9 @@ public int getNumberProduced() {
 		return 4;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalClusterRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalClusterRecipe.java
@@ -33,6 +33,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	private static IRecipe getRecipe(ItemStack out) {
 		int mod = (out.getItemDamage()-ChromaStacks.primaryCluster.getItemDamage())%2;
 		ItemStack is1 = ChromaItems.CLUSTER.getStackOfMetadata(2*mod);

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalCoreRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalCoreRecipe.java
@@ -34,6 +34,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	@Override
 	public int getDuration() {
 		return 2*super.getDuration();

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalFocusRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalFocusRecipe.java
@@ -35,6 +35,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	@Override
 	public int getTypicalCraftedAmount() {
 		return 32;

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalGroupRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalGroupRecipe.java
@@ -44,6 +44,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	private static IRecipe getRecipe(ItemStack out, CrystalElement e1, CrystalElement e2, CrystalElement e3, CrystalElement e4, ItemStack ctr, boolean chg) {
 		return ReikaRecipeHelper.getShapedRecipeFor(out, " A ", "BIC", " D ", 'A', getShardType(e1, chg), 'B', getShardType(e2, chg), 'C', getShardType(e3, chg), 'D', getShardType(e4, chg), 'I', ctr);
 	}

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalLensRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalLensRecipe.java
@@ -36,6 +36,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	@Override
 	public int getTypicalCraftedAmount() {
 		return 64;

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalMirrorRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalMirrorRecipe.java
@@ -38,6 +38,10 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
 
 	@Override
 	public int getTypicalCraftedAmount() {

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalStarRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/CrystalStarRecipe.java
@@ -60,6 +60,11 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 	@Override
 	public int getDuration() {
 		return 4*super.getDuration();

diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/ElementUnitRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/ElementUnitRecipe.java
@@ -55,4 +55,9 @@ public final boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/HighCoreRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/HighCoreRecipe.java
@@ -72,4 +72,9 @@ public final boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/IridescentChunkRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/IridescentChunkRecipe.java
@@ -40,4 +40,9 @@ public final boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/LowCoreRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/LowCoreRecipe.java
@@ -54,4 +54,9 @@ public final boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/LumenChunkRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/LumenChunkRecipe.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * @author Reika Kalseki
- * 
+ *
  * Copyright 2017
- * 
+ *
  * All rights reserved.
  * Distribution of the software in any form is only allowed with
  * explicit, prior permission from the owner.
@@ -52,4 +52,9 @@ public boolean canBeStacked() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/LumenCoreRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/LumenCoreRecipe.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * @author Reika Kalseki
- * 
+ *
  * Copyright 2017
- * 
+ *
  * All rights reserved.
  * Distribution of the software in any form is only allowed with
  * explicit, prior permission from the owner.
@@ -39,4 +39,9 @@ public LumenCoreRecipe(ItemStack out, ItemStack main) {
 		this.addAuraRequirement(CrystalElement.BLUE, 60000);
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return false;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Items/RawCrystalRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Items/RawCrystalRecipe.java
@@ -31,4 +31,9 @@ public boolean canBeSimpleAutomated() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/CastingRecipes/Special/BeeConversionRecipe.java b/Auxiliary/RecipeManagers/CastingRecipes/Special/BeeConversionRecipe.java
@@ -149,4 +149,9 @@ public boolean isModded() {
 		return true;
 	}
 
+	@Override
+	public boolean canGiveDoubleOutput() {
+		return true;
+	}
+
 }
diff --git a/Auxiliary/RecipeManagers/PoolRecipes.java b/Auxiliary/RecipeManagers/PoolRecipes.java
@@ -35,6 +35,7 @@
 import Reika.ChromatiCraft.Magic.Progression.ProgressStage;
 import Reika.ChromatiCraft.Registry.ChromaBlocks;
 import Reika.ChromatiCraft.Registry.ChromaItems;
+import Reika.ChromatiCraft.Registry.Chromabilities;
 import Reika.DragonAPI.ModList;
 import Reika.DragonAPI.ASM.DependentMethodStripper.ModDependent;
 import Reika.DragonAPI.Instantiable.Data.Collections.OneWayCollections.OneWayList;
@@ -161,6 +162,9 @@ public void makePoolRecipe(EntityItem ei, PoolRecipe pr, int ether, int x, int y
 		pr.makeFrom(li);
 		ReikaEntityHelper.decrEntityItemStack(ei, 1);
 		int n = pr.allowDoubling() && ReikaRandomHelper.doWithChance(BlockActiveChroma.getDoublingChance(ether)) ? 2 : 1;
+		EntityPlayer ep = ReikaItemHelper.getDropper(ei);
+		if (Chromabilities.DOUBLECRAFT.enabledOn(ep))
+			n *= 2;
 		int n2 = n*pr.getOutput().stackSize;
 		for (int i = 0; i < n2; i++) {
 			EntityItem newitem = ReikaItemHelper.dropItem(ei, ReikaItemHelper.getSizedItemStack(pr.getOutput(), 1));
@@ -174,7 +178,7 @@ public void makePoolRecipe(EntityItem ei, PoolRecipe pr, int ether, int x, int y
 			ei.worldObj.setBlock(x, y, z, Blocks.air);
 		}
 		ReikaWorldHelper.causeAdjacentUpdates(ei.worldObj, x, y, z);
-		ProgressStage.ALLOY.stepPlayerTo(ReikaItemHelper.getDropper(ei));
+		ProgressStage.ALLOY.stepPlayerTo(ep);
 	}
 
 	public void loadCustomPoolRecipes() {

diff --git a/Resources/machines.xml b/Resources/machines.xml
@@ -820,7 +820,7 @@
 	</toolstorage>
 	<beestorage>
 		<desc>
-			The limitations of that digital storage system's ability to handle many discrete forms of items have become troublesome once again. As soon as you delved into breeding bees, trees, and butterflies, you were quickly inundated with products in every genetic combination you can think of. Not helping is the time your butterfly enclosure sprung a leak and the escapees proceeded to cross-pollinate every tree and plant in sight. Two dozen storage drives for Apple Oak pollen alone is not acceptable, but on the bright side, you have encountered a similar problem to this before, and might have something of a solution...
+			The limitations of that digital storage system's ability to handle many discrete forms of items have become troublesome once again. As soon as you delved into breeding bees, trees, and butterflies, you were quickly inundated with products in every genetic combination conceivable. Not helping is the time your butterfly enclosure sprung a leak and the escapees proceeded to cross-pollinate every tree and plant in sight. Two dozen storage drives for Apple Oak pollen alone is not acceptable, but on the bright side, you have encountered a similar problem to this before, and might have something of a solution...
 		</desc>
 		<note>
 			Stores any variants of one "species format" like pollen, princesses, or larvae

diff --git a/TileEntity/Acquisition/TileEntityItemFabricator.java b/TileEntity/Acquisition/TileEntityItemFabricator.java
@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -31,10 +32,12 @@
 import Reika.ChromatiCraft.Magic.ElementTagCompound;
 import Reika.ChromatiCraft.Magic.Network.CrystalNetworker;
 import Reika.ChromatiCraft.Registry.ChromaTiles;
+import Reika.ChromatiCraft.Registry.Chromabilities;
 import Reika.ChromatiCraft.Registry.CrystalElement;
 import Reika.ChromatiCraft.TileEntity.AOE.Effect.TileEntityAccelerator;
 import Reika.DragonAPI.Instantiable.InertItem;
 import Reika.DragonAPI.Libraries.ReikaInventoryHelper;
+import Reika.DragonAPI.Libraries.ReikaPlayerAPI;
 import Reika.DragonAPI.Libraries.MathSci.ReikaMathLibrary;
 import Reika.DragonAPI.Libraries.Registry.ReikaItemHelper;
 
@@ -208,7 +211,11 @@ private void craft(World world, int x, int y, int z) {
 			((IFluidHandler)te).fill(ForgeDirection.UP, new FluidStack(((FluidRecipe)recipe).fluid, 1000), true);
 		}
 		else {
-			ReikaInventoryHelper.addOrSetStack(recipe.output.copy(), inv, 1);
+			int n = 1;
+			EntityPlayer ep = this.getPlacer();
+			if (ep != null && !ReikaPlayerAPI.isFake(ep) && Chromabilities.DOUBLECRAFT.enabledOn(ep))
+				n = 2;
+			ReikaInventoryHelper.addOrSetStack(recipe.output.copy(), inv, n);
 		}
 		energy.subtract(recipe.energy);
 		progress = 0;

diff --git a/TileEntity/Processing/TileEntityGlowFire.java b/TileEntity/Processing/TileEntityGlowFire.java
@@ -42,6 +42,7 @@
 import Reika.ChromatiCraft.Registry.ChromaPackets;
 import Reika.ChromatiCraft.Registry.ChromaSounds;
 import Reika.ChromatiCraft.Registry.ChromaTiles;
+import Reika.ChromatiCraft.Registry.Chromabilities;
 import Reika.ChromatiCraft.Registry.CrystalElement;
 import Reika.ChromatiCraft.Render.Particle.EntityBlurFX;
 import Reika.ChromatiCraft.Render.Particle.EntityFloatingSeedsFX;
@@ -166,11 +167,15 @@ public boolean craft() {
 		if (energy.isEmpty())
 			return false;
 		ItemStack in = inv[0];
+		ItemStack out = in.copy();
+		EntityPlayer ep = this.getPlacer();
+		if (ep != null && !ReikaPlayerAPI.isFake(ep) && Chromabilities.DOUBLECRAFT.enabledOn(ep))
+			out.stackSize *= 2;
 		inv[0] = null;
 		boolean flag = true;
 		boolean flag2 = false;
 		while(flag) {
-			this.dropItem(in);
+			this.dropItem(out);
 			flag = this.craftAndDrop(in);
 			flag2 |= flag;
 		}

diff --git a/TileEntity/Recipe/TileEntityCastingTable.java b/TileEntity/Recipe/TileEntityCastingTable.java
@@ -63,6 +63,7 @@
 import Reika.ChromatiCraft.Registry.ChromaSounds;
 import Reika.ChromatiCraft.Registry.ChromaStructures;
 import Reika.ChromatiCraft.Registry.ChromaTiles;
+import Reika.ChromatiCraft.Registry.Chromabilities;
 import Reika.ChromatiCraft.Registry.CrystalElement;
 import Reika.ChromatiCraft.Render.BotaniaPetalShower;
 import Reika.ChromatiCraft.Render.Particle.EntityFloatingSeedsFX;
@@ -923,6 +924,8 @@ private void craft() {
 			count--;
 
 			ItemStack toadd = ReikaItemHelper.getSizedItemStack(out, activeRecipe.getOutput().stackSize);
+			if  (Chromabilities.DOUBLECRAFT.enabledOn(craftingPlayer))
+				toadd.stackSize *= 2;
 			NBTTagCompound NBTout = NBTin != null ? (NBTTagCompound)NBTin.copy() : null;
 			if (NBTout != null) {
 				ReikaNBTHelper.combineNBT(NBTout, toadd.stackTagCompound);