Merge branch 'master' into master

dependencies.gradle

@@ -40,12 +40,12 @@ dependencies {
  api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
  api("com.github.GTNewHorizons:GTNHLib:0.5.11:dev")
  api("com.github.GTNewHorizons:ModularUI:1.2.8:dev")
- api("com.github.GTNewHorizons:ModularUI2:2.1.9-1.7.10:dev")
+ api("com.github.GTNewHorizons:ModularUI2:2.1.11-1.7.10:dev")
  api("com.github.GTNewHorizons:waila:1.8.1:dev")
- api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-462-GTNH:dev")
+ api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-463-GTNH:dev")
  api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.36-gtnh:dev")
  api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
- api("com.github.GTNewHorizons:Postea:1.0.11:dev")
+ api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 
  compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
  compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
@@ -63,29 +63,29 @@ dependencies {
  compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
  compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
  compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
- compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false }
+ compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
  compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false }
 
  compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false}
  compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
- compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.17:dev') { transitive = false }
+ compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.24:dev') { transitive = false }
  compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.94-GTNH:dev") { transitive = false }
 
- compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false }
- implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev")
+ compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
+ implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev")
 
  compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
  compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
  compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
  compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
- compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.68:dev") { transitive = false }
+ implementation("com.github.GTNewHorizons:Hodgepodge:2.5.70:dev")
  compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
  compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
  compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
  compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
- compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:dev") {transitive = false}
+ compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:dev") {transitive = false}
  // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
  compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
  compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.25-GTNH:dev') {transitive = false}

src/main/java/bartworks/common/commands/ClearCraftingCache.java

@@ -17,7 +17,7 @@
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import bartworks.ASM.BWCoreStaticReplacementMethodes;
+import bartworks.hooks.BWCoreStaticReplacementMethodes;
 
 public class ClearCraftingCache extends CommandBase {
 

src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java

@@ -36,6 +36,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -48,10 +49,13 @@
 import bartworks.API.BorosilicateGlass;
 import bartworks.common.configs.Configuration;
 import bartworks.util.BWUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -428,4 +432,10 @@ public boolean supportsBatchMode() {
  public boolean supportsVoidProtection() {
  return true;
  }
+
+ @SideOnly(Side.CLIENT)
+ @Override
+ protected ResourceLocation getActivitySoundLoop() {
+ return SoundResource.GT_MACHINES_MEGA_BLAST_FURNACE_LOOP.resourceLocation;
+ }
 }

src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java

@@ -37,6 +37,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -47,9 +48,12 @@
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import bartworks.common.configs.Configuration;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -530,4 +534,10 @@ public boolean supportsBatchMode() {
  public boolean supportsVoidProtection() {
  return true;
  }
+
+ @SideOnly(Side.CLIENT)
+ @Override
+ protected ResourceLocation getActivitySoundLoop() {
+ return SoundResource.GT_MACHINES_MULTI_MEGA_VACUUM_FREEZER_LOOP.resourceLocation;
+ }
 }

src/main/java/bartworks/ASM/BWCoreStaticReplacementMethodes.java → src/main/java/bartworks/hooks/BWCoreStaticReplacementMethodes.java

@@ -11,7 +11,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package bartworks.ASM;
+package bartworks.hooks;
 
 import java.util.HashSet;
 import java.util.Iterator;

src/main/java/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java

@@ -34,7 +34,7 @@
 
 import bartworks.API.recipe.BWNBTDependantCraftingRecipe;
 import bartworks.API.recipe.BartWorksRecipeMaps;
-import bartworks.ASM.BWCoreStaticReplacementMethodes;
+import bartworks.hooks.BWCoreStaticReplacementMethodes;
 import bartworks.system.material.WerkstoffLoader;
 import bartworks.util.BWUtil;
 import bartworks.util.Pair;
@@ -65,14 +65,10 @@ public class CircuitImprintLoader {
  public static void run() {
  HashSet<GTRecipe> toRem = new HashSet<>();
  HashSet<GTRecipe> toAdd = new HashSet<>();
-
  deleteCALRecipesAndTags();
  rebuildCircuitAssemblerMap(toRem, toAdd);
  exchangeRecipesInList(toRem, toAdd);
  makeCircuitImprintRecipes();
-
- toRem = null;
- toAdd = null;
  }
 
  private static void reAddOriginalRecipes() {
@@ -282,14 +278,7 @@ private static void removeOldRecipesFromRegistries() {
  BWCoreStaticReplacementMethodes.clearRecentlyUsedRecipes();
  RecipeMaps.slicerRecipes.getBackend()
  .removeRecipes(gtrecipeWorldCache);
- recipeWorldCache.forEach(r -> {
- try {
- BWUtil.getGTBufferedRecipeList()
- .remove(r);
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
+ GTModHandler.sBufferRecipeList.removeAll(recipeWorldCache);
  recipeWorldCache.clear();
  gtrecipeWorldCache.clear();
  }

src/main/java/bartworks/system/material/WerkstoffLoader.java

@@ -110,7 +110,6 @@
 import bartworks.system.material.werkstoff_loaders.recipe.MetalLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader;
-import bartworks.system.material.werkstoff_loaders.recipe.OreLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.RawOreLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.ToolLoader;
@@ -320,6 +319,8 @@ public static void setUp() {
  public static final Werkstoff Ferberite = new Werkstoff(
  new short[] { 0xB0, 0xB0, 0xB0, 0 },
  "Ferberite",
+ Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND)
+ .setElektrolysis(false),
  Werkstoff.Types.COMPOUND,
  new Werkstoff.GenerationFeatures(),
  11,
@@ -384,6 +385,8 @@ public static void setUp() {
  public static final Werkstoff Huebnerit = new Werkstoff(
  new short[] { 0x80, 0x60, 0x60, 0 },
  "Huebnerite",
+ Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND)
+ .setElektrolysis(false),
  Werkstoff.Types.COMPOUND,
  new Werkstoff.GenerationFeatures(),
  17,
@@ -1657,7 +1660,7 @@ public static void run() {
  }
 
  IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(),
- new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(),
+ new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new RawOreLoader(),
  new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(),
  new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() };
 

src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java

@@ -80,6 +80,7 @@
 import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes;
 import static gtPlusPlus.core.material.MaterialsAlloy.HELICOPTER;
 import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.WHITE_METAL;
 import static tectech.recipe.TecTechRecipeMaps.eyeOfHarmonyRecipes;
@@ -744,7 +745,8 @@ public static boolean isMapIgnored(RecipeMap<?> map) {
  || map == eyeOfHarmonyRecipes
  || map == quantumForceTransformerRecipes
  || map == fluidExtractionRecipes
- || map == alloyBlastSmelterRecipes;
+ || map == alloyBlastSmelterRecipes
+ || map == vacuumFurnaceRecipes;
  }
 
  public static String displayRecipe(GTRecipe recipe) {
@@ -798,6 +800,15 @@ public static String displayRecipe(GTRecipe recipe) {
 
  @SuppressWarnings({ "unchecked", "rawtypes" })
  public static void replacePureElements() {
+ // Cache the ItemList.values() call
+ final ItemList[] values = ItemList.values();
+ final ArrayList<ItemStack> ITEMLIST_VALUES = new ArrayList<>(values.length);
+ for (ItemList e : values) {
+ if (e.hasBeenSet()) {
+ ITEMLIST_VALUES.add(e.get(1));
+ }
+ }
+
  // furnace
  for (Object entry : FurnaceRecipes.smelting()
  .getSmeltingList()
@@ -823,7 +834,7 @@ public static void replacePureElements() {
 
  Werkstoff mat = (ass.mMaterial.mMaterial.equals(Materials.Platinum)) ? PTMetallicPowder : PDMetallicPowder;
 
- if (PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) continue;
+ if (PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey(), ITEMLIST_VALUES)) continue;
  realEntry.setValue(mat.get(prefix, stack.stackSize * 2));
  }
  // vanilla crafting
@@ -877,7 +888,7 @@ public static void replacePureElements() {
  || BWUtil.areStacksEqualOrNull(Ruthenium.get(dustPure), recipe.mOutputs[i]))
  && !BWUtil.areStacksEqualOrNull(Ruthenium.get(ingot), recipe.mInputs[0])) {
  for (ItemStack mInput : recipe.mInputs)
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES)) continue recipeloop;
  int amount = recipe.mOutputs[i].stackSize * 2;
  GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
  recipe.mOutputs[i] = LeachResidue.get(dust, amount);
@@ -888,7 +899,7 @@ public static void replacePureElements() {
  || BWUtil.areStacksEqualOrNull(Rhodium.get(dustPure), recipe.mOutputs[i]))
  && !BWUtil.areStacksEqualOrNull(Rhodium.get(ingot), recipe.mInputs[0])) {
  for (ItemStack mInput : recipe.mInputs)
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES)) continue recipeloop;
  int amount = recipe.mOutputs[i].stackSize * 2;
  GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
  recipe.mOutputs[i] = CrudeRhMetall.get(dust, amount);
@@ -899,7 +910,7 @@ public static void replacePureElements() {
  if (GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial
  .equals(Materials.Platinum)) {
  for (ItemStack mInput : recipe.mInputs) {
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES)) continue recipeloop;
  }
  if (dust.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
  || dustImpure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
@@ -922,7 +933,7 @@ public static void replacePureElements() {
  } else if (GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial
  .equals(Materials.Palladium)) {
  for (ItemStack mInput : recipe.mInputs) {
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES)) continue recipeloop;
  }
  if (dust.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
  || dustImpure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
@@ -949,7 +960,8 @@ public static void replacePureElements() {
  } else if (GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial
  .equals(Materials.Osmium)) {
  for (ItemStack mInput : recipe.mInputs) {
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES))
+ continue recipeloop;
  }
  if (dust.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
  || dustImpure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
@@ -977,7 +989,8 @@ public static void replacePureElements() {
  } else if (GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial
  .equals(Materials.Iridium)) {
  for (ItemStack mInput : recipe.mInputs) {
- if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
+ if (PlatinumSludgeOverHaul.isInBlackList(mInput, ITEMLIST_VALUES))
+ continue recipeloop;
  }
  if (dust.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
  || dustImpure
@@ -1106,7 +1119,7 @@ public static boolean checkRecipe(Object input, Materials mat) {
  return false;
  }
 
- private static boolean isInBlackList(ItemStack stack) {
+ private static boolean isInBlackList(ItemStack stack, List<ItemStack> ITEMLIST_VALUES) {
  if (stack == null || stack.getItem() instanceof BWMetaGeneratedItems
  || MainMod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId)
  || BartWorksCrossmod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId))
@@ -1122,10 +1135,11 @@ private static boolean isInBlackList(ItemStack stack) {
  if (Block.getBlockFromItem(stack.getItem()) instanceof GTGenericBlock
  && !(Block.getBlockFromItem(stack.getItem()) instanceof BlockOresAbstract)) return true;
 
- if (Arrays.stream(ItemList.values())
- .filter(ItemList::hasBeenSet)
- .anyMatch(e -> !BWUtil.checkStackAndPrefix(stack) && GTUtility.areStacksEqual(e.get(1), stack, true)))
- return true;
+ for (ItemStack itemStack : ITEMLIST_VALUES) {
+ if (!BWUtil.checkStackAndPrefix(stack) && GTUtility.areStacksEqual(itemStack, stack, true)) {
+ return true;
+ }
+ }
 
  if (stack.getItem() instanceof GTGenericItem) {
  if (!BWUtil.checkStackAndPrefix(stack)) return false;