From 499411aa21ac4a742b6d51ef3ce9c4046d0a22c1 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 25 Jan 2019 04:34:06 +0000
Subject: + Added recipes to obtain Astral Titanium, Celestial Tungsten
 Advanced Nitinol and Chromatic Glass. + Added Particle Physics, so some basic
 extent. + Added new textures for some Meta items. + Added new textures for
 all particles and ions. + Added Custom Debug NBT to error ingots, in the
 event one is obtained by a player. + Added more information to the tooltip of
 Control Cores. + Added more uniform ways to obtain tiered item components to
 CI. - Hard disable of GC Fuel tweaks for the moment. % Hopefully greatly
 improved the cape handler. Cape list is now stored on Overmind's site,
 meaning it can be updated outside of the mod. % Cape Handler now will store
 the cape data locally in a .dat for offline use, this can be updated anytime
 by removing it, or once a week if outdated) % Tweaked Cyclotron Recipe map to
 support new changes to functionality. % Tweaked RTG fuel pellet production
 time in Cyclotron to be 100x. % Adjusted requirements for Quicklime to
 generate (It may vanish after this commit, May be worth rolling back if an
 issue.). % Adjusted code to use checkForInvalidItems instead of direct item
 comparisons in several places. % Renamed Buffer Cores to Energy Cores. %
 Adjusted recipes for Energy Cores and Energy Buffers, they now require 6 slot
 assembly. $ Fixed Multiblock handling during structure checks, they'd
 accidentally detect the controller as an invalid block.

---
 .../xmod/gregtech/loaders/RecipeGen_BlastSmelter.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index d6be5def19..9e00ada163 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -4,22 +4,22 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.*;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeGen_BlastSmelter extends RecipeGen_Base {
@@ -208,7 +208,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 							if (M.getComposites().get(irc) != null){
 								final int r = (int) M.vSmallestRatio[irc];
 								inputStackCount = inputStackCount+r;
-								if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) || ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){
+								if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) || !ItemUtils.checkForInvalidItems(M.getComposites().get(irc).getDustStack(r))){
 									final int xr = r;
 									if ((xr > 0) && (xr <= 100)){
 										final int mathmatics = (r*1000);
-- 
cgit