Fixed sounds

Closes #80. Version updated: 4.12
This commit is contained in:
TheDarkDnKTv 2021-03-21 03:25:13 +02:00
parent 5794e9fe2d
commit a1d8d5f328
43 changed files with 293 additions and 61 deletions

View file

@ -27,7 +27,7 @@ compileJava {
sourceCompatibility = targetCompatibility = '1.8' sourceCompatibility = targetCompatibility = '1.8'
} }
version = "410" version = "412"
group = "gregtechmod" group = "gregtechmod"
archivesBaseName = "gregtechmod" archivesBaseName = "gregtechmod"

View file

@ -147,7 +147,7 @@ import cpw.mods.fml.relauncher.Side;
/** /**
* @author Gregorius Techneticies * @author Gregorius Techneticies
*/ */
@Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.08s", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;") @Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.12", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;")
public class GT_Mod implements IGT_Mod { public class GT_Mod implements IGT_Mod {
@Instance @Instance
public static GT_Mod instance; public static GT_Mod instance;
@ -155,7 +155,7 @@ public class GT_Mod implements IGT_Mod {
@SidedProxy(clientSide = "gregtechmod.common.GT_Client", serverSide = "gregtechmod.common.GT_Server") @SidedProxy(clientSide = "gregtechmod.common.GT_Client", serverSide = "gregtechmod.common.GT_Server")
public static GT_Proxy gregtechproxy; public static GT_Proxy gregtechproxy;
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
public static volatile int REQUIRED_IC2 = 397; public static volatile int REQUIRED_IC2 = 397;
public static boolean public static boolean
sThaumiumObtainable = false, sThaumiumObtainable = false,

View file

@ -42,7 +42,7 @@ import net.minecraftforge.oredict.OreDictionary;
*/ */
public class GregTech_API { public class GregTech_API {
/** For the API Version check */ /** For the API Version check */
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar. */ /** The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar. */
public static IGT_Mod gregtechmod; public static IGT_Mod gregtechmod;

View file

@ -306,5 +306,5 @@ public enum Element {
return mProtons + mNeutrons + mAdditionalMass; return mProtons + mNeutrons + mAdditionalMass;
} }
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
} }

View file

@ -1182,5 +1182,5 @@ public enum Materials {
mChemicalFormula = mChemicalFormula.replaceAll("_", "-"); mChemicalFormula = mChemicalFormula.replaceAll("_", "-");
} }
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
} }

View file

@ -383,5 +383,5 @@ public enum OrePrefixes {
return aName == null ? false : aName.startsWith(aPrefix.toString()); return aName == null ? false : aName.startsWith(aPrefix.toString());
} }
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
} }

View file

@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
* This is the main TileEntity for EVERYTHING. * This is the main TileEntity for EVERYTHING.
*/ */
public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileEntity { public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileEntity {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
public byte mConnections = 0; public byte mConnections = 0;

View file

@ -41,7 +41,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
* This is the main TileEntity for EVERYTHING. * This is the main TileEntity for EVERYTHING.
*/ */
public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity { public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileEntity {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
protected MetaTileEntity mMetaTileEntity; protected MetaTileEntity mMetaTileEntity;
protected int mStoredRF = 0, mStoredEnergy = 0, mStoredSteam = 0, mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0; protected int mStoredRF = 0, mStoredEnergy = 0, mStoredSteam = 0, mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0;

View file

@ -34,7 +34,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* "new GT_MetaTileEntity_E_Furnace(54, "GT_E_Furnace", "Automatic E-Furnace");" * "new GT_MetaTileEntity_E_Furnace(54, "GT_E_Furnace", "Automatic E-Furnace");"
*/ */
public abstract class MetaPipeEntity implements IMetaTileEntity { public abstract class MetaPipeEntity implements IMetaTileEntity {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** /**
* This variable tells, which directions the Block is connected to. It is a Bitmask. * This variable tells, which directions the Block is connected to. It is a Bitmask.

View file

@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* "new GT_MetaTileEntity_E_Furnace(54, "GT_E_Furnace", "Automatic E-Furnace");" * "new GT_MetaTileEntity_E_Furnace(54, "GT_E_Furnace", "Automatic E-Furnace");"
*/ */
public abstract class MetaTileEntity implements IMetaTileEntity { public abstract class MetaTileEntity implements IMetaTileEntity {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
@Override @Override
public byte getTileEntityBaseType() { public byte getTileEntityBaseType() {

View file

@ -8,6 +8,7 @@ import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_OreDictUnificator;
import gregtechmod.api.util.GT_Utility;
import gregtechmod.api.util.ListAdapter; import gregtechmod.api.util.ListAdapter;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -28,12 +29,14 @@ public class GT_MetaTileEntity_E_Furnace extends GT_MetaTileEntity_BasicMachine
// see @MetaTileEntity to register MetaTileEntities // see @MetaTileEntity to register MetaTileEntities
public GT_MetaTileEntity_E_Furnace(int aID, String aName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_E_Furnace(int aID, String aName, RecipeMap<?> recipeMap) {
super(aID, aName, recipeMap); super(aID, aName, recipeMap);
loopLen = 90;
} }
// An empty constructor, which is needed for several Java reasons // An empty constructor, which is needed for several Java reasons
public GT_MetaTileEntity_E_Furnace(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_E_Furnace(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
recipeLogic.setProgressTimeManipulator(time -> time * (1 + mHeatingCoilTier)); recipeLogic.setProgressTimeManipulator(time -> time * (1 + mHeatingCoilTier));
loopLen = 90;
} }
// Apply your empty constructor here // Apply your empty constructor here
@ -97,6 +100,19 @@ public class GT_MetaTileEntity_E_Furnace extends GT_MetaTileEntity_BasicMachine
return new ListAdapter<>(mInventory, 3, 4); return new ListAdapter<>(mInventory, 3, 4);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(207), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
// The Furnace Front Texture when it does nothing // The Furnace Front Texture when it does nothing

View file

@ -31,6 +31,8 @@ import net.minecraftforge.fluids.FluidStack;
public abstract class GT_MetaTileEntity_BasicMachine extends MetaTileEntity implements IRecipeWorkable { public abstract class GT_MetaTileEntity_BasicMachine extends MetaTileEntity implements IRecipeWorkable {
public boolean bAlloyInputFromOutputSide = false, bOutput = false, bItemTransfer = false, bSeperatedInputs = false, bHasBeenUpdated = false, bStuttering = false; public boolean bAlloyInputFromOutputSide = false, bOutput = false, bItemTransfer = false, bSeperatedInputs = false, bHasBeenUpdated = false, bStuttering = false;
public int mMainFacing = -1; public int mMainFacing = -1;
public int loopLen = 30;
public int lastLoopCall = Integer.MIN_VALUE;
protected RecipeLogic recipeLogic; protected RecipeLogic recipeLogic;
@ -255,6 +257,16 @@ public abstract class GT_MetaTileEntity_BasicMachine extends MetaTileEntity impl
if (aIndex == 8) GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(210), 100, 1.0F, aX, aY, aZ); if (aIndex == 8) GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(210), 100, 1.0F, aX, aY, aZ);
} }
@Override
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
super.startSoundLoop(aIndex, aX, aY, aZ);
long time = getBaseMetaTileEntity().getTimer();
if (lastLoopCall + loopLen < time) {
lastLoopCall = (int) time;
doSound(aIndex, aX, aY, aZ);
}
}
public boolean doesAutoOutput() { public boolean doesAutoOutput() {
return true; return true;
} }

View file

@ -33,7 +33,7 @@ import net.minecraftforge.fluids.FluidStack;
* I know this File causes some Errors, because of missing Main Functions, but if you just need to compile Stuff, then remove said erroreous Functions. * I know this File causes some Errors, because of missing Main Functions, but if you just need to compile Stuff, then remove said erroreous Functions.
*/ */
public class Recipe { public class Recipe {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
private List<Ingredient> itemInputs; private List<Ingredient> itemInputs;
private List<ItemStack> itemOutputs; private List<ItemStack> itemOutputs;

View file

@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* All Functions run usually in a seperate try/catch Block, so that failed Logic won't crash the TileEntity. * All Functions run usually in a seperate try/catch Block, so that failed Logic won't crash the TileEntity.
*/ */
public abstract class GT_CircuitryBehavior { public abstract class GT_CircuitryBehavior {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** /**
* @param aIndex 0 - 1023 are my own Indices, so use other Numbers! * @param aIndex 0 - 1023 are my own Indices, so use other Numbers!

View file

@ -5,7 +5,7 @@ import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
public class GT_Config { public class GT_Config {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
public static boolean system = false; public static boolean system = false;

View file

@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
* For Covers with a special behavior. * For Covers with a special behavior.
*/ */
public abstract class GT_CoverBehavior { public abstract class GT_CoverBehavior {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** /**
* Gives all Covers which are out of these Stacks a special behavior. * Gives all Covers which are out of these Stacks a special behavior.

View file

@ -1,7 +1,7 @@
package gregtechmod.api.util; package gregtechmod.api.util;
public class GT_LanguageManager { public class GT_LanguageManager {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
public static String[] mNameList0 = {"Adv_Machine", "Fusioncoil", "Iridium_reinforced_Stone", "Block_of_Silver", "Block_of_Ruby", "Block_of_Sapphire", "LESU_Block", "Block_of_Aluminium", "Block_of_Titanium", "Block_of_Chrome", "Highly_Advanced_Machineblock", "Block_of_Steel", "Block_of_Brass", "Standard_Machine_Casing", "Reinforced_Machine_Casing", "Advanced_Machine_Casing"}; public static String[] mNameList0 = {"Adv_Machine", "Fusioncoil", "Iridium_reinforced_Stone", "Block_of_Silver", "Block_of_Ruby", "Block_of_Sapphire", "LESU_Block", "Block_of_Aluminium", "Block_of_Titanium", "Block_of_Chrome", "Highly_Advanced_Machineblock", "Block_of_Steel", "Block_of_Brass", "Standard_Machine_Casing", "Reinforced_Machine_Casing", "Advanced_Machine_Casing"};
public static String[] mNameList1 = {"GT_BUG", "Fusionreactor", "Lightningrod", "Quantumchest", "GregTech_Computercube", "UUM_Assembler", "Sonictron", "Lapotronic_Energystorageunit", "Interdimensional_Energystorageunit", "Adjustable_Energystorageunit", "Charge_O_Mat", "Industrial_Centrifuge", "Superconductorwire", "Playerdetector", "Matterfabricator", "Supercondensator"}; public static String[] mNameList1 = {"GT_BUG", "Fusionreactor", "Lightningrod", "Quantumchest", "GregTech_Computercube", "UUM_Assembler", "Sonictron", "Lapotronic_Energystorageunit", "Interdimensional_Energystorageunit", "Adjustable_Energystorageunit", "Charge_O_Mat", "Industrial_Centrifuge", "Superconductorwire", "Playerdetector", "Matterfabricator", "Supercondensator"};

View file

@ -51,7 +51,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
* Due to the many imports, this File can cause compile Problems if not all the APIs are installed * Due to the many imports, this File can cause compile Problems if not all the APIs are installed
*/ */
public class GT_ModHandler { public class GT_ModHandler {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** /**
* Returns if that Liquid is Water * Returns if that Liquid is Water

View file

@ -26,7 +26,7 @@ import net.minecraftforge.oredict.OreDictionary;
* P.S. It is intended to be named "Unificator" and not "Unifier", because that sounds more awesome. * P.S. It is intended to be named "Unificator" and not "Unifier", because that sounds more awesome.
*/ */
public class GT_OreDictUnificator { public class GT_OreDictUnificator {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
private static final HashMap<String, ItemStack> sName2OreMap = new HashMap<String, ItemStack>(); private static final HashMap<String, ItemStack> sName2OreMap = new HashMap<String, ItemStack>();
private static final HashMap<ItemStack, String> sToRegister = new HashMap<ItemStack, String>(); private static final HashMap<ItemStack, String> sToRegister = new HashMap<ItemStack, String>();

View file

@ -22,7 +22,7 @@ import net.minecraft.item.crafting.IRecipe;
* Class for Automatic Recipe registering. * Class for Automatic Recipe registering.
*/ */
public class GT_RecipeRegistrator { public class GT_RecipeRegistrator {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
/** /**
* List of Materials, which are used in the Creation of Sticks. All Rod Materials are automatically added to this List. * List of Materials, which are used in the Creation of Sticks. All Rod Materials are automatically added to this List.
*/ */

View file

@ -69,7 +69,7 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper;
* Just a few Utility Functions I use. * Just a few Utility Functions I use.
*/ */
public class GT_Utility { public class GT_Utility {
public static volatile int VERSION = 410; public static volatile int VERSION = 412;
public static final List<Character> sNumberedCharacters = Arrays.asList('0', '1', '2', '3', '4', '5', '6', '7', '8', '9'); public static final List<Character> sNumberedCharacters = Arrays.asList('0', '1', '2', '3', '4', '5', '6', '7', '8', '9');
public static final List<Character> sUpperCasedCharacters = Arrays.asList('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'); public static final List<Character> sUpperCasedCharacters = Arrays.asList('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');

View file

@ -12,6 +12,8 @@ import net.minecraft.network.play.server.S02PacketChat;
import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.common.ForgeHooks;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@ -37,10 +39,12 @@ public class GT_ConnectionHandler implements Runnable {
EntityPlayerMP aPlayer = handler.playerEntity; EntityPlayerMP aPlayer = handler.playerEntity;
if (aPlayer == null) return; if (aPlayer == null) return;
String aUserName = aPlayer.getDisplayName(); String aUserName = aPlayer.getDisplayName();
if (!GT_Mod.mAlreadyPlayed || aUserName.equalsIgnoreCase("richardg867") || true) { if (!GT_Mod.mAlreadyPlayed || aUserName.equalsIgnoreCase("richardg867")) {
handler.sendPacket(new S02PacketChat(new ChatComponentTranslation("gregtechmod.log_in.text_1"))); handler.sendPacket(new S02PacketChat(new ChatComponentTranslation("gregtechmod.log_in.text_1")));
handler.sendPacket(new S02PacketChat(new ChatComponentTranslation("gregtechmod.log_in.text_2"))); handler.sendPacket(new S02PacketChat(new ChatComponentTranslation("gregtechmod.log_in.text_2")));
handler.sendPacket(new S02PacketChat(new ChatComponentText("Github page: " + EnumChatFormatting.YELLOW.toString() + "https://github.com/Nukepowered/GregTech4"))); IChatComponent comp = ForgeHooks.newChatWithLinks("https://github.com/Nukepowered/GregTech4");
comp.getChatStyle().setColor(EnumChatFormatting.YELLOW);
handler.sendPacket(new S02PacketChat(new ChatComponentText("Github page: ").appendSibling(comp)));
handler.sendPacket(new S02PacketChat(new ChatComponentText("~ Gregorius Techneticies, TheDarkDnKTv"))); handler.sendPacket(new S02PacketChat(new ChatComponentText("~ Gregorius Techneticies, TheDarkDnKTv")));
if (aUserName.equalsIgnoreCase("richardg867")) { if (aUserName.equalsIgnoreCase("richardg867")) {

View file

@ -2,6 +2,7 @@ package gregtechmod.common.recipe.maps;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_ModHandler;
@ -27,7 +28,7 @@ public class FurnanceRecipeMap extends DummyRecipeMap {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
ItemStack output; ItemStack output;
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {

View file

@ -3,6 +3,7 @@ package gregtechmod.common.recipe.maps;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
@ -24,7 +25,7 @@ public class IC2RecipeMap extends DummyRecipeMap {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> input, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> input, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
for (ItemStack in : input) { for (ItemStack in : input) {
if (GT_Utility.isStackValid(in)) { if (GT_Utility.isStackValid(in)) {
ItemStack inValid = in.copy(); ItemStack inValid = in.copy();

View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.function.Predicate;
import java.util.Optional; import java.util.Optional;
import java.util.Random; import java.util.Random;
@ -34,8 +35,8 @@ public class PulverizerRecipeMap extends RecipeMap<SimpleRecipeFactory> {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
Recipe result = super.findRecipe(inputs, fluidInputs); Recipe result = super.findRecipe(inputs, fluidInputs, metaChecker);
for (int i = 0; i < inputs.size() && result == null; i++) { for (int i = 0; i < inputs.size() && result == null; i++) {
ItemStack input = inputs.get(i); ItemStack input = inputs.get(i);

View file

@ -1,6 +1,7 @@
package gregtechmod.common.recipe.maps; package gregtechmod.common.recipe.maps;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import gregtechmod.api.enums.Dyes; import gregtechmod.api.enums.Dyes;
@ -29,7 +30,7 @@ public class RecipeMapPrinter extends RecipeMap<SimpleRecipeFactory> {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> itemInputs, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> itemInputs, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
if (GT_Utility.isStackValid(itemInputs.get(2)) && GT_Utility.isStackValid(itemInputs.get(0)) && GT_Utility.isStackValid(itemInputs.get(1))) { if (GT_Utility.isStackValid(itemInputs.get(2)) && GT_Utility.isStackValid(itemInputs.get(0)) && GT_Utility.isStackValid(itemInputs.get(1))) {
if (itemInputs.get(2).getItem() == Items.writable_book || itemInputs.get(2).getItem() == Items.written_book && if (itemInputs.get(2).getItem() == Items.writable_book || itemInputs.get(2).getItem() == Items.written_book &&
itemInputs.get(0).getItem() == Items.book itemInputs.get(0).getItem() == Items.book
@ -65,6 +66,6 @@ public class RecipeMapPrinter extends RecipeMap<SimpleRecipeFactory> {
} }
return super.findRecipe(itemInputs, fluidInputs); return super.findRecipe(itemInputs, fluidInputs, metaChecker);
} }
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.common.recipe.maps;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
import gregtechmod.api.enums.GT_Items; import gregtechmod.api.enums.GT_Items;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
@ -23,7 +24,7 @@ public class RecyclerRecipeMap extends DummyRecipeMap {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
for (ItemStack slot : inputs) { for (ItemStack slot : inputs) {
if (GT_Utility.isStackValid(slot)) { if (GT_Utility.isStackValid(slot)) {
ItemStack instance = slot.copy(); ItemStack instance = slot.copy();

View file

@ -2,6 +2,7 @@ package gregtechmod.common.recipe.maps;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
import gregtechmod.api.enums.GT_Items; import gregtechmod.api.enums.GT_Items;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
@ -22,7 +23,7 @@ public class ScannerRecipeMap extends DummyRecipeMap {
} }
@Override @Override
public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs) { public Recipe findRecipe(List<ItemStack> inputs, List<FluidStack> fluidInputs, Predicate<Recipe> metaChecker) {
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
ItemStack input = inputs.get(i); ItemStack input = inputs.get(i);
if (GT_Utility.isStackValid(input) && GT_Items.IC2_Crop_Seeds.isStackEqual(input, true, true)) { if (GT_Utility.isStackValid(input) && GT_Items.IC2_Crop_Seeds.isStackEqual(input, true, true)) {

View file

@ -1,11 +1,12 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_OreDictUnificator;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -16,10 +17,25 @@ public class GT_MetaTileEntity_AlloySmelter extends GT_MetaTileEntity_BasicMachi
public GT_MetaTileEntity_AlloySmelter(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_AlloySmelter(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 130;
} }
public GT_MetaTileEntity_AlloySmelter(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_AlloySmelter(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 130;
}
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(202), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
} }
@Override @Override

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_Bender extends GT_MetaTileEntity_BasicMachine { public class GT_MetaTileEntity_Bender extends GT_MetaTileEntity_BasicMachine {
public GT_MetaTileEntity_Bender(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Bender(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 170;
} }
public GT_MetaTileEntity_Bender(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Bender(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 170;
} }
@Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 140);} @Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 140);}
@ -24,6 +27,19 @@ public class GT_MetaTileEntity_Bender extends GT_MetaTileEntity_BasicMachine {
return new GT_MetaTileEntity_Bender(recipeLogic.recipeMap); return new GT_MetaTileEntity_Bender(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(206), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 238; return 238;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_Compressor extends GT_MetaTileEntity_BasicMachine { public class GT_MetaTileEntity_Compressor extends GT_MetaTileEntity_BasicMachine {
public GT_MetaTileEntity_Compressor(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Compressor(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_Compressor(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Compressor(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 133);} @Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 133);}
@ -24,6 +27,19 @@ public class GT_MetaTileEntity_Compressor extends GT_MetaTileEntity_BasicMachine
return new GT_MetaTileEntity_Compressor(recipeLogic.recipeMap); return new GT_MetaTileEntity_Compressor(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(203), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 248; return 248;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_Extractor extends GT_MetaTileEntity_BasicMachine { public class GT_MetaTileEntity_Extractor extends GT_MetaTileEntity_BasicMachine {
public GT_MetaTileEntity_Extractor(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Extractor(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_Extractor(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Extractor(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 132);} @Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 132);}
@ -24,6 +27,19 @@ public class GT_MetaTileEntity_Extractor extends GT_MetaTileEntity_BasicMachine
return new GT_MetaTileEntity_Extractor(recipeLogic.recipeMap); return new GT_MetaTileEntity_Extractor(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(200), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getSideFacingInactive() { public int getSideFacingInactive() {
return 242; return 242;

View file

@ -14,10 +14,12 @@ public class GT_MetaTileEntity_Extruder extends GT_MetaTileEntity_BasicMachine {
public GT_MetaTileEntity_Extruder(int aID, String aName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Extruder(int aID, String aName, RecipeMap<?> recipeMap) {
super(aID, aName, recipeMap); super(aID, aName, recipeMap);
loopLen = 130;
} }
public GT_MetaTileEntity_Extruder(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Extruder(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 130;
} }
public int getElectricTier() { public int getElectricTier() {
@ -32,14 +34,16 @@ public class GT_MetaTileEntity_Extruder extends GT_MetaTileEntity_BasicMachine {
return new GT_MetaTileEntity_Extruder(recipeLogic.recipeMap); return new GT_MetaTileEntity_Extruder(recipeLogic.recipeMap);
} }
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { @Override
super.startSoundLoop(aIndex, aX, aY, aZ); public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if(aIndex == 1) { if(aIndex == 1) {
GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(208)), 10, 1.0F, aX, aY, aZ); GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(208)), 10, 1.0F, aX, aY, aZ);
} }
} }
@Override
public void startProcess() { public void startProcess() {
this.sendLoopStart((byte)1); this.sendLoopStart((byte)1);
} }

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_Macerator extends GT_MetaTileEntity_BasicMachine { public class GT_MetaTileEntity_Macerator extends GT_MetaTileEntity_BasicMachine {
public GT_MetaTileEntity_Macerator(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Macerator(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 300;
} }
public GT_MetaTileEntity_Macerator(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Macerator(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 300;
} }
@Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 131);} @Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 131);}
@ -24,6 +27,19 @@ public class GT_MetaTileEntity_Macerator extends GT_MetaTileEntity_BasicMachine
return new GT_MetaTileEntity_Macerator(recipeLogic.recipeMap); return new GT_MetaTileEntity_Macerator(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(201), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 244; return 244;

View file

@ -2,10 +2,12 @@ package gregtechmod.common.tileentities.machines.basic;
import java.util.List; import java.util.List;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import gregtechmod.api.util.ListAdapter; import gregtechmod.api.util.ListAdapter;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -14,10 +16,12 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine
public GT_MetaTileEntity_Pulverizer(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Pulverizer(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_Pulverizer(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_Pulverizer(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override public void onRightclick(EntityPlayer aPlayer) { @Override public void onRightclick(EntityPlayer aPlayer) {
@ -29,6 +33,19 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine
return new GT_MetaTileEntity_Pulverizer(recipeLogic.recipeMap); return new GT_MetaTileEntity_Pulverizer(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(201), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public List<ItemStack> getInputItems() { public List<ItemStack> getInputItems() {
return new ListAdapter<>(mInventory, 1, 2); return new ListAdapter<>(mInventory, 1, 2);

View file

@ -1,11 +1,12 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_ModHandler;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -26,6 +27,19 @@ public class GT_MetaTileEntity_Recycler extends GT_MetaTileEntity_BasicMachine {
return new GT_MetaTileEntity_Recycler(recipeLogic.recipeMap); return new GT_MetaTileEntity_Recycler(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(204), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 248; return 248;

View file

@ -37,14 +37,15 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
return super.allowPutStack(aIndex, aSide, aStack) && GT_Items.IC2_Crop_Seeds.isStackEqual(aStack, true, true); return super.allowPutStack(aIndex, aSide, aStack) && GT_Items.IC2_Crop_Seeds.isStackEqual(aStack, true, true);
} }
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { @Override
super.startSoundLoop(aIndex, aX, aY, aZ); public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) { if (aIndex == 1) {
GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ); GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(212), 10, 1.0F, aX, aY, aZ);
} }
} }
@Override
public void startProcess() { public void startProcess() {
this.sendLoopStart((byte) 1); this.sendLoopStart((byte) 1);
} }

View file

@ -1,10 +1,11 @@
package gregtechmod.common.tileentities.machines.basic; package gregtechmod.common.tileentities.machines.basic;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_Wiremill extends GT_MetaTileEntity_BasicMachine { public class GT_MetaTileEntity_Wiremill extends GT_MetaTileEntity_BasicMachine {
@ -24,6 +25,19 @@ public class GT_MetaTileEntity_Wiremill extends GT_MetaTileEntity_BasicMachine {
return new GT_MetaTileEntity_Wiremill(recipeLogic.recipeMap); return new GT_MetaTileEntity_Wiremill(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(204), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getTopFacingInactive() { public int getTopFacingInactive() {
return 235; return 235;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.steam; package gregtechmod.common.tileentities.machines.steam;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_BronzeAlloySmelter extends GT_MetaTileEntity_BasicMachine_Bronze { public class GT_MetaTileEntity_BronzeAlloySmelter extends GT_MetaTileEntity_BasicMachine_Bronze {
public GT_MetaTileEntity_BronzeAlloySmelter(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeAlloySmelter(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 130;
} }
public GT_MetaTileEntity_BronzeAlloySmelter(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeAlloySmelter(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 130;
} }
@Override @Override
@ -27,6 +30,19 @@ public class GT_MetaTileEntity_BronzeAlloySmelter extends GT_MetaTileEntity_Basi
return new GT_MetaTileEntity_BronzeAlloySmelter(recipeLogic.recipeMap); return new GT_MetaTileEntity_BronzeAlloySmelter(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(202), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public boolean hasTwoSeperateInputs() { public boolean hasTwoSeperateInputs() {
return true; return true;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.steam; package gregtechmod.common.tileentities.machines.steam;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_BronzeCompressor extends GT_MetaTileEntity_BasicMachine_Bronze { public class GT_MetaTileEntity_BronzeCompressor extends GT_MetaTileEntity_BasicMachine_Bronze {
public GT_MetaTileEntity_BronzeCompressor(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeCompressor(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_BronzeCompressor(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeCompressor(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override @Override
@ -27,6 +30,19 @@ public class GT_MetaTileEntity_BronzeCompressor extends GT_MetaTileEntity_BasicM
return new GT_MetaTileEntity_BronzeCompressor(recipeLogic.recipeMap); return new GT_MetaTileEntity_BronzeCompressor(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(203), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 340; return 340;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.steam; package gregtechmod.common.tileentities.machines.steam;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_BronzeExtractor extends GT_MetaTileEntity_BasicMachine_Bronze { public class GT_MetaTileEntity_BronzeExtractor extends GT_MetaTileEntity_BasicMachine_Bronze {
public GT_MetaTileEntity_BronzeExtractor(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeExtractor(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_BronzeExtractor(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeExtractor(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override @Override
@ -27,6 +30,19 @@ public class GT_MetaTileEntity_BronzeExtractor extends GT_MetaTileEntity_BasicMa
return new GT_MetaTileEntity_BronzeExtractor(recipeLogic.recipeMap); return new GT_MetaTileEntity_BronzeExtractor(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(200), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 342; return 342;

View file

@ -1,20 +1,23 @@
package gregtechmod.common.tileentities.machines.steam; package gregtechmod.common.tileentities.machines.steam;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
import gregtechmod.api.recipe.RecipeMap; import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_BronzeMacerator extends GT_MetaTileEntity_BasicMachine_Bronze { public class GT_MetaTileEntity_BronzeMacerator extends GT_MetaTileEntity_BasicMachine_Bronze {
public GT_MetaTileEntity_BronzeMacerator(int aID, String mName, RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeMacerator(int aID, String mName, RecipeMap<?> recipeMap) {
super(aID, mName, recipeMap); super(aID, mName, recipeMap);
loopLen = 290;
} }
public GT_MetaTileEntity_BronzeMacerator(RecipeMap<?> recipeMap) { public GT_MetaTileEntity_BronzeMacerator(RecipeMap<?> recipeMap) {
super(recipeMap); super(recipeMap);
loopLen = 290;
} }
@Override @Override
@ -27,6 +30,19 @@ public class GT_MetaTileEntity_BronzeMacerator extends GT_MetaTileEntity_BasicMa
return new GT_MetaTileEntity_BronzeMacerator(recipeLogic.recipeMap); return new GT_MetaTileEntity_BronzeMacerator(recipeLogic.recipeMap);
} }
@Override
public void doSound(byte aIndex, double aX, double aY, double aZ) {
super.doSound(aIndex, aX, aY, aZ);
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(201), 10, 1.0F, aX, aY, aZ);
}
}
@Override
public void startProcess() {
this.sendLoopStart((byte) 1);
}
@Override @Override
public int getFrontFacingInactive() { public int getFrontFacingInactive() {
return 326; return 326;

View file

@ -3,11 +3,11 @@
"name": "GregTech-Addon", "name": "GregTech-Addon",
"description": "This Addon adds the awesome Technology of GregTech-Intergalactical to your World! Fusionreactors, Lightningrods and many other Technologies and convenient Recipes are added by this Addon, if you let them enabled in the allmighty Config, of course", "description": "This Addon adds the awesome Technology of GregTech-Intergalactical to your World! Fusionreactors, Lightningrods and many other Technologies and convenient Recipes are added by this Addon, if you let them enabled in the allmighty Config, of course",
"mcversion": "1.7.10", "mcversion": "1.7.10",
"version": "4.10", "version": "4.12",
"logoFile": "/assets/gregtech_addon/textures/LogoGTI_Long.png", "logoFile": "/assets/gregtech_addon/textures/LogoGTI_Long.png",
"url": "https://github.com/Nukepowered/GregTech4", "url": "https://github.com/Nukepowered/GregTech4",
"updateUrl": "", "updateUrl": "",
"authors": ["Gregorius Techneticies"], "authorList": ["Gregorius Techneticies", "TheDarkDnKTv", "sferatime"],
"credits": "Alblaka and his Team for Industrialcraft, mistaqur for the original NEI-Plugin, Mr. Brain, TheSirusKing and matix for Textures, TheDarkDnKTv and sferatime for porting", "credits": "Alblaka and his Team for Industrialcraft, mistaqur for the original NEI-Plugin, Mr. Brain, TheSirusKing and matix for Textures, TheDarkDnKTv and sferatime for porting",
"parent": "", "parent": "",
"screenshots": [], "screenshots": [],