Fixed All proxies and TickHandler
This commit is contained in:
parent
05b5ec1c30
commit
c5bc147460
53 changed files with 324 additions and 198 deletions
|
@ -1174,7 +1174,7 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder {
|
|||
CompressedStreamTools.writeCompressed(tNBT, new FileOutputStream(new File(tDirectory, "GT_IDSU_Energyvalues.dat")));
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
GT_Log.log.catching(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1195,7 +1195,7 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder {
|
|||
}
|
||||
} catch (Throwable e) {
|
||||
if (!(e instanceof java.io.FileNotFoundException))
|
||||
e.printStackTrace();
|
||||
GT_Log.log.catching(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -824,5 +824,6 @@ public class GregTech_API {
|
|||
sSoundList.put(106, GregTech_API.IC2_MOD_ID + ":" + "tools.drill.DrillSoft");
|
||||
sSoundList.put(107, GregTech_API.IC2_MOD_ID + ":" + "tools.drill.DrillHard");
|
||||
sSoundList.put(108, GregTech_API.IC2_MOD_ID + ":" + "ODScanner");
|
||||
// sSoundList.put(108, GregTech_API.MOD_ID + ":" + "ODScanner");
|
||||
}
|
||||
}
|
|
@ -137,6 +137,7 @@ public class GT_HardHammer_Item extends GT_Tool_Item {
|
|||
tY = aY-5+tRandom.nextInt(11);
|
||||
tZ = aZ-5+tRandom.nextInt(11);
|
||||
tBlock = aWorld.getBlock(tX, tY, tZ);
|
||||
if (tBlock == Blocks.air) continue;
|
||||
tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
|
||||
tString = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
|
||||
if (tString != null && tString.startsWith("ore")) {
|
||||
|
|
|
@ -8,9 +8,7 @@ import net.minecraft.world.World;
|
|||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
public class GT_Client extends GT_Proxy {
|
||||
// public static GT_TickHandler mClientTickHandler = new GT_TickHandler(false);
|
||||
// public static GT_SoundAdder mSoundAdder = new GT_SoundAdder();
|
||||
// public static GT_Renderer mRenderer = new GT_Renderer();
|
||||
public static GT_Renderer mRenderer = new GT_Renderer();
|
||||
|
||||
public boolean isServerSide() {
|
||||
return true;
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
package gregtechmod.common;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public abstract class GT_Proxy {
|
||||
// public static GT_TickHandler mServerTickHandler = new GT_TickHandler(true);
|
||||
public static GT_FuelHandler mFuelHandler = new GT_FuelHandler();
|
||||
public static GT_TickHandler mTickHandler;
|
||||
public static GT_FuelHandler mFuelHandler;
|
||||
|
||||
/**
|
||||
* This means that Server specific Basefiles are definitely existing! Not if the World is actually server side or not!
|
||||
|
@ -20,4 +21,10 @@ public abstract class GT_Proxy {
|
|||
public abstract void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ);
|
||||
|
||||
public abstract int addArmor(String aPrefix);
|
||||
|
||||
static {
|
||||
mTickHandler = new GT_TickHandler();
|
||||
mFuelHandler = new GT_FuelHandler();
|
||||
FMLCommonHandler.instance().bus().register(mTickHandler);
|
||||
}
|
||||
}
|
|
@ -1,55 +0,0 @@
|
|||
package gregtechmod.common;
|
||||
|
||||
import gregtechmod.api.GregTech_API;
|
||||
import gregtechmod.api.util.GT_Log;
|
||||
import net.minecraft.client.audio.SoundPoolEntry;
|
||||
|
||||
public class GT_SoundAdder {
|
||||
public GT_SoundAdder() {
|
||||
net.minecraftforge.common.MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
@SuppressWarnings("deprecation")
|
||||
@net.minecraftforge.event.ForgeSubscribe
|
||||
public void onSound(net.minecraftforge.client.event.sound.SoundLoadEvent event) {
|
||||
try {
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/chainsaw/ChainsawIdle" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/chainsaw/ChainsawStop" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/chainsaw/ChainsawUseOne" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/chainsaw/ChainsawUseTwo" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/drill/DrillHard" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/drill/DrillSoft" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/drill/DrillUseLoop" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/jetpack/JetpackFire" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/jetpack/JetpackLoop" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/mininglaser/MiningLaser" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/mininglaser/MiningLaserExplosive" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/mininglaser/MiningLaserLongRange" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/mininglaser/MiningLaserLowFocus" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/mininglaser/MiningLaserScatter" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/nanosabre/NanosabreIdle" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/nanosabre/NanosabrePowerup" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/nanosabre/NanosabreSwing1" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/nanosabre/NanosabreSwing2" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/nanosabre/NanosabreSwing3" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/quantumsuit/HelmetLoop" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/quantumsuit/QuantumsuitBoots" + ".ogg");
|
||||
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/BatteryUse" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/Dynamiteomote" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/InsulationCutters" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/NukeExplosion" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/ODScanner" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/Painter" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/RubberTrampoline" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/Treetap" + ".ogg");
|
||||
event.manager.soundPoolSounds.addSound(GregTech_API.IC2_MOD_ID + ":" + "tools/Wrench" + ".ogg");
|
||||
} catch(Throwable e) {
|
||||
GT_Log.log.catching(e);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -5,140 +5,128 @@ import gregtechmod.api.GregTech_API;
|
|||
import gregtechmod.api.util.GT_OreDictUnificator;
|
||||
import gregtechmod.api.util.GT_Utility;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import net.minecraft.world.WorldSettings.GameType;
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
|
||||
public class GT_TickHandler implements ITickHandler {
|
||||
public class GT_TickHandler {
|
||||
public static boolean isFirstTick = true;
|
||||
|
||||
public GT_TickHandler(boolean aServer) {
|
||||
TickRegistry.registerTickHandler(this, aServer?Side.SERVER:Side.CLIENT);
|
||||
|
||||
@SubscribeEvent
|
||||
public void onServerTick(TickEvent.ServerTickEvent event) {
|
||||
if (GT_Mod.mDoNotInit || event.phase == Phase.START) return;
|
||||
GregTech_API.sServerTickCounter++;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tickStart(EnumSet<TickType> aType, Object... aData) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void tickEnd(EnumSet<TickType> aType, Object... aData) {
|
||||
if (GT_Mod.mDoNotInit) return;
|
||||
if (aType.contains(TickType.SERVER)) {
|
||||
GregTech_API.sServerTickCounter++;
|
||||
@SubscribeEvent
|
||||
public void onClientTick(TickEvent.ClientTickEvent event) {
|
||||
if (GT_Mod.mDoNotInit || event.phase == Phase.START) return;
|
||||
if (GregTech_API.sClientTickCounter++ % 30 == 0) GT_Utility.sPlayedSoundMap.clear();
|
||||
/*
|
||||
try {
|
||||
if (GT_ConnectionHandler.sClientManager != null) {
|
||||
if (GregTech_API.DEBUG_MODE && mTickCounter % 100 == 0) {
|
||||
GT_ConnectionHandler.sClientManager.addToSendQueue(new Packet250CustomPayload("UNREGISTER", "DIChannel".getBytes()));
|
||||
GT_ConnectionHandler.sClientManager.addToSendQueue(new Packet250CustomPayload("UNREGISTER", "BC".getBytes()));
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onWorldTick(TickEvent.WorldTickEvent event) {
|
||||
if (GT_Mod.mDoNotInit || event.phase == Phase.START) return;
|
||||
GregTech_API.sWorldTickCounter++;
|
||||
if (event.world != null) {
|
||||
if (GT_Mod.mUniverse == null) GT_Mod.mUniverse = event.world;
|
||||
|
||||
if (isFirstTick) {
|
||||
GT_Mod.readIDSUData();
|
||||
isFirstTick = false;
|
||||
}
|
||||
|
||||
/*
|
||||
if (mServerTickCounter % 1000 == 100 || mClientTickCounter % 1000 == 100) {
|
||||
ItemStack tStack = GT_ModHandler.getAllRecipeOutput(new ItemStack[] {new ItemStack(Block.wood, 1, 0)}, tWorld);
|
||||
if ( (GT_Mod.sNerfedStoneTools && (Item.pickaxeStone.getMaxDamage() != 48 || Item.shovelStone.getMaxDamage() != 48 || Item.axeStone.getMaxDamage() != 48 || Item.swordStone.getMaxDamage() != 48 || Item.hoeStone.getMaxDamage() != 48))
|
||||
|| (GT_Mod.sNerfedWoodenTools && (Item.pickaxeWood .getMaxDamage() != 12 || Item.shovelWood .getMaxDamage() != 12 || Item.axeWood .getMaxDamage() != 12 || Item.swordWood .getMaxDamage() != 12 || Item.hoeWood .getMaxDamage() != 12))
|
||||
|| !GT_Utility.areStacksEqual(tStack, new ItemStack(Block.planks, 1, 0)) || tStack == null || tStack.stackSize != (GT_Mod.sNerfedWoodPlank?2:4)) {
|
||||
throw new GT_ItsNotMyFaultException("Another Mod decided to ACTIVELY break a fully configurable Feature of GregTech. Please report this to said Mod Author and not to me, as I can't do anything against that misbehavior. If the detection of breaking my Features, results in incompatibility between said Mod and GregTech, then I don't care.");
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (GregTech_API.sServerTickCounter%20==0) {
|
||||
for (Object tItem : event.world.loadedEntityList) {
|
||||
if (tItem instanceof EntityItem && ((EntityItem)tItem).lifespan == 6000) {
|
||||
((EntityItem)tItem).lifespan = GT_Mod.sItemDespawnTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (GregTech_API.sServerTickCounter % 10000 == 0) GT_Mod.writeIDSUData();
|
||||
}
|
||||
if (aType.contains(TickType.CLIENT)) {
|
||||
if (GregTech_API.sClientTickCounter++%30 == 0) GT_Utility.sPlayedSoundMap.clear();
|
||||
/*
|
||||
try {
|
||||
if (GT_ConnectionHandler.sClientManager != null) {
|
||||
if (GregTech_API.DEBUG_MODE && mTickCounter % 100 == 0) {
|
||||
GT_ConnectionHandler.sClientManager.addToSendQueue(new Packet250CustomPayload("UNREGISTER", "DIChannel".getBytes()));
|
||||
GT_ConnectionHandler.sClientManager.addToSendQueue(new Packet250CustomPayload("UNREGISTER", "BC".getBytes()));
|
||||
}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGH)
|
||||
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
|
||||
if (event.phase != Phase.START && event.player != null && !event.player.isDead) {
|
||||
if (event.player.worldObj.isRemote) {
|
||||
if (event.player instanceof EntityPlayerSP) {
|
||||
GT_Utility.sCurrentPlayer = event.player;
|
||||
}
|
||||
if (event.player.getDisplayName().equalsIgnoreCase("immibis")) {
|
||||
for (int i = 1; i <= 42; i++) {
|
||||
if (GregTech_API.sConfiguration.addAdvConfig("PumpkinOfShame", "Config.Random.Number."+new Random(i).nextInt(4200), true)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
event.player.inventory.armorInventory[3] = new ItemStack(Blocks.pumpkin, 1, 0);
|
||||
event.player.inventory.armorInventory[3].setStackDisplayName("Pumpkin of Shame");
|
||||
}
|
||||
} else {
|
||||
if (GregTech_API.sServerTickCounter % 200==0 && (event.player.capabilities.allowEdit || event.player.isCurrentToolAdventureModeExempt(0, -10000, 0)) && !event.player.capabilities.isCreativeMode && GT_Mod.sSurvivalIntoAdventure) {
|
||||
event.player.setGameType(GameType.ADVENTURE);
|
||||
boolean temp = event.player.capabilities.allowEdit || event.player.isCurrentToolAdventureModeExempt(0, -10000, 0);
|
||||
event.player.capabilities.allowEdit = false;
|
||||
if (temp) {
|
||||
GT_Utility.sendChatToPlayer(event.player, "Adventure Mode has been broken. Please consult the nice Guys at Forge to fix whatever they broke. Best solution would be some kind of spamming the responsible Person or similar.");
|
||||
}
|
||||
if (GT_Mod.sAxeWhenAdventure) {
|
||||
if (!temp) GT_Utility.sendChatToPlayer(event.player, "It's dangerous to go alone. Take this with you.");
|
||||
event.player.worldObj.spawnEntityInWorld(new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, GregTech_API.getGregTechItem(127, 1, 0)));
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
if (aType.contains(TickType.WORLD)) {
|
||||
GregTech_API.sWorldTickCounter++;
|
||||
World tWorld = (World)aData[0];
|
||||
if (tWorld != null) {
|
||||
if (GT_Mod.mUniverse == null) GT_Mod.mUniverse = tWorld;
|
||||
|
||||
if (isFirstTick) {
|
||||
GT_Mod.readIDSUData();
|
||||
isFirstTick = false;
|
||||
}
|
||||
|
||||
/*
|
||||
if (mServerTickCounter % 1000 == 100 || mClientTickCounter % 1000 == 100) {
|
||||
ItemStack tStack = GT_ModHandler.getAllRecipeOutput(new ItemStack[] {new ItemStack(Block.wood, 1, 0)}, tWorld);
|
||||
if ( (GT_Mod.sNerfedStoneTools && (Item.pickaxeStone.getMaxDamage() != 48 || Item.shovelStone.getMaxDamage() != 48 || Item.axeStone.getMaxDamage() != 48 || Item.swordStone.getMaxDamage() != 48 || Item.hoeStone.getMaxDamage() != 48))
|
||||
|| (GT_Mod.sNerfedWoodenTools && (Item.pickaxeWood .getMaxDamage() != 12 || Item.shovelWood .getMaxDamage() != 12 || Item.axeWood .getMaxDamage() != 12 || Item.swordWood .getMaxDamage() != 12 || Item.hoeWood .getMaxDamage() != 12))
|
||||
|| !GT_Utility.areStacksEqual(tStack, new ItemStack(Block.planks, 1, 0)) || tStack == null || tStack.stackSize != (GT_Mod.sNerfedWoodPlank?2:4)) {
|
||||
throw new GT_ItsNotMyFaultException("Another Mod decided to ACTIVELY break a fully configurable Feature of GregTech. Please report this to said Mod Author and not to me, as I can't do anything against that misbehavior. If the detection of breaking my Features, results in incompatibility between said Mod and GregTech, then I don't care.");
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (GregTech_API.sServerTickCounter%20==0) {
|
||||
for (Object tItem : tWorld.loadedEntityList) {
|
||||
if (tItem instanceof EntityItem && ((EntityItem)tItem).lifespan == 6000) {
|
||||
((EntityItem)tItem).lifespan = GT_Mod.sItemDespawnTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (GregTech_API.sServerTickCounter%10000==0) GT_Mod.writeIDSUData();
|
||||
}
|
||||
}
|
||||
|
||||
if (aType.contains(TickType.PLAYER)) {
|
||||
EntityPlayer tPlayer = (EntityPlayer)aData[0];
|
||||
if (tPlayer != null && !tPlayer.isDead) {
|
||||
if (tPlayer.worldObj.isRemote) {
|
||||
if (tPlayer instanceof EntityPlayerSP) {
|
||||
GT_Utility.sCurrentPlayer = tPlayer;
|
||||
}
|
||||
if (tPlayer.username.equalsIgnoreCase("immibis")) {
|
||||
for (int i = 1; i <= 42; i++) {
|
||||
if (GregTech_API.sConfiguration.addAdvConfig("PumpkinOfShame", "Config.Random.Number."+new Random(i).nextInt(4200), true)) {
|
||||
tPlayer.inventory.armorInventory[3] = new ItemStack(Block.pumpkin, 1, 0);
|
||||
tPlayer.inventory.armorInventory[3].setItemName("Pumpkin of Shame");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (GregTech_API.sServerTickCounter%200==0 && (tPlayer.capabilities.allowEdit || tPlayer.isCurrentToolAdventureModeExempt(0, -10000, 0)) && !tPlayer.capabilities.isCreativeMode && GT_Mod.sSurvivalIntoAdventure) {
|
||||
tPlayer.setGameType(EnumGameType.ADVENTURE);
|
||||
boolean temp = tPlayer.capabilities.allowEdit || tPlayer.isCurrentToolAdventureModeExempt(0, -10000, 0);
|
||||
tPlayer.capabilities.allowEdit = false;
|
||||
if (temp) {
|
||||
GT_Utility.sendChatToPlayer(tPlayer, "Adventure Mode has been broken. Please consult the nice Guys at Forge to fix whatever they broke. Best solution would be some kind of spamming the responsible Person or similar.");
|
||||
}
|
||||
if (GT_Mod.sAxeWhenAdventure) {
|
||||
if (!temp) GT_Utility.sendChatToPlayer(tPlayer, "It's dangerous to go alone. Take this with you.");
|
||||
tPlayer.worldObj.spawnEntityInWorld(new EntityItem(tPlayer.worldObj, tPlayer.posX, tPlayer.posY, tPlayer.posZ, GregTech_API.getGregTechItem(127, 1, 0)));
|
||||
}
|
||||
}
|
||||
if (GregTech_API.sServerTickCounter % 120 == 0) {
|
||||
int tCount = 64;
|
||||
for (int i = 0; i < 36; i++) {
|
||||
if (tPlayer.inventory.getStackInSlot(i) != null) {
|
||||
tCount+=(tPlayer.inventory.getStackInSlot(i).stackSize * 64) / Math.max(1, tPlayer.inventory.getStackInSlot(i).getMaxStackSize());
|
||||
if (GT_Mod.sInventoryUnification) GT_OreDictUnificator.setStack(true, tPlayer.inventory.getStackInSlot(i));
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (tPlayer.inventory.armorInventory[i] != null) {
|
||||
tCount+=256;
|
||||
}
|
||||
}
|
||||
|
||||
if (GT_Mod.sHungerEffect && GregTech_API.sServerTickCounter % 2400 == 1200) tPlayer.addExhaustion(Math.max(1.0F, tCount/666.6F));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<TickType> ticks() {
|
||||
return EnumSet.of(TickType.RENDER, TickType.WORLD, TickType.PLAYER, TickType.SERVER, TickType.CLIENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() { return "GT_TickHandler"; }
|
||||
if (GregTech_API.sServerTickCounter % 120 == 0) {
|
||||
int tCount = 64;
|
||||
for (int i = 0; i < 36; i++) {
|
||||
if (event.player.inventory.getStackInSlot(i) != null) {
|
||||
tCount+=(event.player.inventory.getStackInSlot(i).stackSize * 64) / Math.max(1, event.player.inventory.getStackInSlot(i).getMaxStackSize());
|
||||
if (GT_Mod.sInventoryUnification) GT_OreDictUnificator.setStack(true, event.player.inventory.getStackInSlot(i));
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (event.player.inventory.armorInventory[i] != null) {
|
||||
tCount += 256;
|
||||
}
|
||||
}
|
||||
|
||||
if (GT_Mod.sHungerEffect && GregTech_API.sServerTickCounter % 2400 == 1200) event.player.addExhaustion(Math.max(1.0F, tCount/666.6F));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -78,7 +78,7 @@ public class GT_Debug_Item extends GT_Generic_Item implements IElectricItem {
|
|||
@Override
|
||||
public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float aClickX, float aClickY, float aClickZ) {
|
||||
if (aWorld.isRemote) {
|
||||
// GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(108), 1.0F, aX, aY, aZ); // FIXME sound
|
||||
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(108), 1.0F, aX, aY, aZ);
|
||||
return false;
|
||||
}
|
||||
if (aPlayer instanceof EntityPlayerMP && GT_ModHandler.canUseElectricItem(aStack, 25000)) {
|
||||
|
|
|
@ -13,10 +13,11 @@ import net.minecraft.util.MathHelper;
|
|||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
public class GT_Renderer extends RenderPlayer {
|
||||
|
||||
public GT_Renderer() {
|
||||
|
@ -24,15 +25,15 @@ public class GT_Renderer extends RenderPlayer {
|
|||
setRenderManager(RenderManager.instance);
|
||||
}
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void receiveRenderEvent(RenderPlayerEvent.Pre aEvent) {
|
||||
if (GT_Utility.getFullInvisibility(aEvent.entityPlayer)) {aEvent.setCanceled(true); return;}
|
||||
}
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
|
||||
AbstractClientPlayer aPlayer = (AbstractClientPlayer)aEvent.entityPlayer;
|
||||
float aPartialTicks = aEvent.partialTicks;
|
||||
float aPartialTicks = aEvent.partialRenderTick;
|
||||
|
||||
if (GT_Utility.getFullInvisibility(aPlayer)) {aEvent.setCanceled(true); return;}
|
||||
|
||||
|
@ -42,19 +43,22 @@ public class GT_Renderer extends RenderPlayer {
|
|||
try {
|
||||
ResourceLocation tResource = null;
|
||||
|
||||
if (GT_Mod.sAdminNames.contains(aPlayer.username.toLowerCase()))
|
||||
if (GT_Mod.sAdminNames.contains(aPlayer.getDisplayName().toLowerCase()))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/AdminCape.png");
|
||||
if (GT_Mod.sPremiumNames.contains(aPlayer.username.toLowerCase()))
|
||||
if (GT_Mod.sPremiumNames.contains(aPlayer.getDisplayName().toLowerCase()))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/PremiumCape.png");
|
||||
if (GT_Mod.mBrainTechCapeList.contains(aPlayer.username.toLowerCase()))
|
||||
if (GT_Mod.mBrainTechCapeList.contains(aPlayer.getDisplayName().toLowerCase()))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/BrainTechCape.png");
|
||||
if (GT_Mod.mGregTechCapeList.contains(aPlayer.username.toLowerCase()))
|
||||
if (GT_Mod.mGregTechCapeList.contains(aPlayer.getDisplayName().toLowerCase()))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/GregTechCape.png");
|
||||
if (aPlayer.username.equalsIgnoreCase("Mr_Brain"))
|
||||
if (aPlayer.getDisplayName().equalsIgnoreCase("Mr_Brain"))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/MrBrainCape.png");
|
||||
if (aPlayer.username.equalsIgnoreCase("GregoriusT"))
|
||||
if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT"))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/GregoriusCape.png");
|
||||
|
||||
if (aPlayer.getDisplayName().equalsIgnoreCase("The_DnK"))
|
||||
tResource = new ResourceLocation(GregTech_API.MOD_ID, "textures/GregTechCape.png");
|
||||
|
||||
|
||||
if (!aPlayer.getHideCape()) {
|
||||
bindTexture(tResource);
|
||||
GL11.glPushMatrix();
|
||||
|
|
182
src/main/resources/assets/ic2/sounds.json
Normal file
182
src/main/resources/assets/ic2/sounds.json
Normal file
|
@ -0,0 +1,182 @@
|
|||
{
|
||||
"ChainsawIdle": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/chainsaw/ChainsawIdle" }
|
||||
]
|
||||
},
|
||||
"ChainsawStop": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/chainsaw/ChainsawStop" }
|
||||
]
|
||||
},
|
||||
"ChainsawUseOne": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/chainsaw/ChainsawUseOne" }
|
||||
]
|
||||
},
|
||||
"ChainsawUseTwo": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/chainsaw/ChainsawUseTwo" }
|
||||
]
|
||||
},
|
||||
"DrillHard": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/drill/DrillHard" }
|
||||
]
|
||||
},
|
||||
"DrillSoft": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/drill/DrillSoft" }
|
||||
]
|
||||
},
|
||||
"DrillUseLoop": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/drill/DrillUseLoop" }
|
||||
]
|
||||
},
|
||||
"JetpackFire": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/jetpack/JetpackFire" }
|
||||
]
|
||||
},
|
||||
"JetpackLoop": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/jetpack/JetpackLoop" }
|
||||
]
|
||||
},
|
||||
"MiningLaser": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/mininglaser/MiningLaser" }
|
||||
]
|
||||
},
|
||||
"MiningLaserExplosive": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/mininglaser/MiningLaserExplosive" }
|
||||
]
|
||||
},
|
||||
"MiningLaserLongRange": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/mininglaser/MiningLaserLongRange" }
|
||||
]
|
||||
},
|
||||
"MiningLaserLowFocus": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/mininglaser/MiningLaserLowFocus" }
|
||||
]
|
||||
},
|
||||
"MiningLaserScatter": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/mininglaser/MiningLaserScatter" }
|
||||
]
|
||||
},
|
||||
"NanosabreIdle": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/nanosabre/NanosabreIdle" }
|
||||
]
|
||||
},
|
||||
"NanosabrePowerup": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/nanosabre/NanosabrePowerup" }
|
||||
]
|
||||
},
|
||||
"NanosabreSwing1": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/nanosabre/NanosabreSwing1" }
|
||||
]
|
||||
},
|
||||
"NanosabreSwing2": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/nanosabre/NanosabreSwing2" }
|
||||
]
|
||||
},
|
||||
"NanosabreSwing3": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/nanosabre/NanosabreSwing3" }
|
||||
]
|
||||
},
|
||||
"HelmetLoop": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/quantumsuit/HelmetLoop" }
|
||||
]
|
||||
},
|
||||
"QuantumsuitBoots": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/quantumsuit/QuantumsuitBoots" }
|
||||
]
|
||||
},
|
||||
"BatteryUse": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/BatteryUse" }
|
||||
]
|
||||
},
|
||||
"Dynamiteomote": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/Dynamiteomote" }
|
||||
]
|
||||
},
|
||||
"InsulationCutters": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/InsulationCutters" }
|
||||
]
|
||||
},
|
||||
"NukeExplosion": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/NukeExplosion" }
|
||||
]
|
||||
},
|
||||
"ODScanner": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/ODScanner" }
|
||||
]
|
||||
},
|
||||
"Painter": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/Painter" }
|
||||
]
|
||||
},
|
||||
"RubberTrampoline": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/RubberTrampoline" }
|
||||
]
|
||||
},
|
||||
"Treetap": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/Treetap" }
|
||||
]
|
||||
},
|
||||
"Wrench": {
|
||||
"category": "player",
|
||||
"sounds": [
|
||||
{ "name":"ic2:tools/Wrench" }
|
||||
]
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue