Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/remove-32x-textures' into remove…
Browse files Browse the repository at this point in the history
…-32x-textures
  • Loading branch information
BlueHero233 committed Sep 28, 2024
2 parents e1315b7 + 5734354 commit 0ee2dd9
Show file tree
Hide file tree
Showing 132 changed files with 1,181 additions and 820 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {

compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev")
compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.13:dev")
implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
// Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
}
21 changes: 21 additions & 0 deletions src/main/java/bartworks/system/material/Werkstoff.java
Original file line number Diff line number Diff line change
Expand Up @@ -1089,8 +1089,29 @@ public Werkstoff.Stats setQualityOverride(byte qualityOverride) {
private double ebfGasRecipeTimeMultiplier = -1.0;
private double ebfGasRecipeConsumedAmountMultiplier = 1.0;

private boolean autoGenerateBlastFurnaceRecipes = true;
private boolean autoGenerateVacuumFreezerRecipes = true;

float durMod = 1f;

public boolean autoGenerateBlastFurnaceRecipes() {
return autoGenerateBlastFurnaceRecipes;
}

public boolean autoGenerateVacuumFreezerRecipes() {
return autoGenerateVacuumFreezerRecipes;
}

public Werkstoff.Stats disableAutoGeneratedBlastFurnaceRecipes() {
autoGenerateBlastFurnaceRecipes = false;
return this;
}

public Werkstoff.Stats disableAutoGeneratedVacuumFreezerRecipes() {
autoGenerateVacuumFreezerRecipes = false;
return this;
}

public float getDurMod() {
return this.durMod;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/bartworks/system/material/WerkstoffLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,7 @@ public static void setUp() {
new Werkstoff.GenerationFeatures().onlyDust()
.addMolten()
.addMetalItems()
.addCraftingMetalWorkingItems()
.enforceUnification(),
64,
TextureSet.SET_METALLIC
Expand Down Expand Up @@ -1236,6 +1237,7 @@ public static void setUp() {
.onlyDust()
.addMetalItems()
.addMolten()
.addCraftingMetalWorkingItems()
.enforceUnification(),
78,
TextureSet.SET_METALLIC);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 0ee2dd9

Please sign in to comment.