Fix Carpenter output Dupe bug

Allow Biogas Engine fuel tank to be drained externally.
(cherry picked from commit 81d2c1971c)
2026-11-15 01:24:59 +00:00 · 2015-09-26 23:06:56 -07:00 · 2015-09-26 19:51:33 -07:00 · 2015-09-26 14:45:04 -07:00 · 2015-09-24 01:47:11 -07:00 · 2015-09-24 01:46:48 -07:00
5 changed files with 21 additions and 12 deletions
@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.3.1370-1.7.10
 version_major=3
 version_minor=6
-version_patch=7
+version_patch=9
@@ -1102,12 +1102,14 @@ public abstract class InvTools {
 	}

 	public static boolean tryAddStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) {
-		int added = addStack(inventory, stack, startSlot, slots, doAdd);
-		if (all) {
-			return added == stack.stackSize;
-		} else {
-			return added > 0;
+		int added = addStack(inventory, stack, startSlot, slots, false);
+		boolean success = all ? (added == stack.stackSize) : (added > 0);
+
+		if (success	&& doAdd) {
+			addStack(inventory, stack, startSlot, slots, true);
 		}
+
+		return success;
 	}

 	public static int addStack(IInventory inventory, ItemStack stack, boolean doAdd) {
@@ -68,7 +68,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank
 		setInternalInventory(new EngineBronzeInventoryAdapter(this));

 		fuelTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet());
-		fuelTank.tankMode = StandardTank.TankMode.INPUT;
+		fuelTank.tankMode = StandardTank.TankMode.DEFAULT;
 		heatingTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA);
 		heatingTank.tankMode = StandardTank.TankMode.INPUT;
 		this.tankManager = new TankManager(fuelTank, heatingTank);
@@ -58,6 +58,9 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve
 			for (int i = SLOT_STAMPS_1; i < SLOT_STAMPS_1 + SLOT_STAMPS_COUNT; i++) {
 				slots.add(i);
 			}
+			for (int i = SLOT_RECEIVE_BUFFER; i < SLOT_RECEIVE_BUFFER + SLOT_RECEIVE_BUFFER_COUNT; i++) {
+				slots.add(i);
+			}
 			for (int i = SLOT_SEND_BUFFER; i < SLOT_SEND_BUFFER + SLOT_SEND_BUFFER_COUNT; i++) {
 				slots.add(i);
 			}
@@ -95,6 +98,10 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve

 			return false;
 		}
+		@Override
+		public boolean isItemValidForSlot(int i, ItemStack itemstack) {
+			return canSlotAccept(i, itemstack);
+		}
 	}

 	// / CONSTANTS
@@ -275,11 +275,11 @@ public class PluginIC2 extends ForestryPlugin {
 			}
 		}

-		if (plantBall != null && compressedPlantBall != null) {
-			RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 4, Fluids.BIOMASS);
-			RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 5, Fluids.BIOMASS);
-		} else {
-			Proxies.log.fine("No IC2 plantballs found.");
+		if (plantBall != null) {
+			RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
+		}
+		if (compressedPlantBall != null) {
+			RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS);
 		}

 		if (resin != null) {
Author	SHA1	Message	Date
mezz	27b9b7bc57	Fix Carpenter output Dupe bug	2015-09-26 23:06:56 -07:00
Nirek-K	06b1f9fabf	Allow Biogas Engine fuel tank to be drained externally. (cherry picked from commit `81d2c1971c`)	2015-09-26 19:51:33 -07:00
Nirek-K	b00f92ab76	Fix #847 TradeStation not outputting items to automation (also fix insertion filtering) (cherry picked from commit `9478ffb7c1`)	2015-09-26 14:45:04 -07:00
mezz	83a41d41d3	Bump version to 3.6.8	2015-09-24 01:47:11 -07:00
Nirek-K	a47fab4579	Make plantball value slightly less terrible (equal to 9 wheat, so 'slightly' better to combine wheat, still worse for things like saplings) (cherry picked from commit `31bd1e82fd`)	2015-09-24 01:46:48 -07:00
Nirek-K	07389fe1dc	Fix #829 IC2 plantballs not working in fermenter (cherry picked from commit `b56a299f63`)	2015-09-24 01:46:42 -07:00