xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some tom relatedstuff

Browse Source
This commit is contained in:
Bob 2021-11-03 23:38:10 +01:00
parent d59e69893c
commit 6af3e1c066
3 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/hbm/blocks/generic/BlockBobble.java
View File

@ -1,8 +1,14 @@
package com.hbm.blocks.generic;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
@ -36,9 +42,21 @@ public class BlockBobble extends BlockContainer {
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
int meta = MathHelper.floor_double((double)((player.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < BobbleType.values().length; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
int meta = MathHelper.floor_double((double)((player.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;
world.setBlockMetadataWithNotify(x, y, z, meta, 2);
TileEntityBobble bobble = (TileEntityBobble) world.getTileEntity(x, y, z);
bobble.type = BobbleType.values()[stack.getItemDamage() % BobbleType.values().length];
bobble.markDirty();
}
@Override

1
src/main/java/com/hbm/inventory/recipes/MachineRecipes.java
View File

@ -2029,6 +2029,7 @@ public class MachineRecipes {
break;
case HELIUM3:
output[0] = new FluidStack(1000, FluidType.HELIUM3);
break;
case OSMIRIDIUM_DEATH:
output[0] = new FluidStack(1000, FluidType.DEATH);
break;

39
src/main/java/com/hbm/main/ModEventHandler.java
View File

@ -35,6 +35,7 @@ import com.hbm.handler.EntityEffectHandler;
import com.hbm.hazard.HazardSystem;
import com.hbm.interfaces.IBomb;
import com.hbm.handler.HTTPHandler;
import com.hbm.handler.ImpactWorldHandler;
import com.hbm.items.IEquipReceiver;
import com.hbm.items.ModItems;
import com.hbm.items.armor.ArmorFSB;
@ -108,11 +109,13 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntitySign;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatStyle;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EntityDamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.FoodStats;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
@ -712,6 +715,37 @@ public class ModEventHandler {
@SubscribeEvent
public void worldTick(WorldTickEvent event) {
/// TOM IMPACT START///
if(event.world != null && !event.world.isRemote && event.phase == Phase.START) {
float settle = 1F / 14400000F; /// 600 days to completely clear all
/// dust.
float cool = 1F / 24000F;/// One MC day between initial impact and
/// total darkness.
ImpactWorldHandler.impactEffects(event.world);
TomSaveData data = TomSaveData.forWorld(event.world);
NBTTagCompound tag = data.getData();
float atmosphericDust = tag.getFloat("dust");
float firestorm = tag.getFloat("fire");
boolean hasImpacted = tag.getBoolean("impact");
data.impact = hasImpacted;
if(atmosphericDust > 0 && firestorm == 0) {
tag.setFloat("dust", Math.max(0, atmosphericDust - settle));
data.markDirty();
data.dust = atmosphericDust;
}
if(firestorm > 0) {
tag.setFloat("fire", Math.max(0, (firestorm - cool)));
tag.setFloat("dust", Math.min(1, (atmosphericDust + cool)));
data.markDirty();
data.fire = firestorm;
data.dust = atmosphericDust;
}
dust = data.dust;
fire = data.fire;
impact = data.impact;
}
/// TOM IMPACT END///
/// RADIATION STUFF START ///
if(event.world != null && !event.world.isRemote && GeneralConfig.enableRads) {
@ -734,6 +768,11 @@ public class ModEventHandler {
//effect for radiation
EntityLivingBase entity = (EntityLivingBase) e;
if(entity.worldObj.provider.dimensionId == 0 && fire > 0 && dust < 0.75f && event.world.getSavedLightValue(EnumSkyBlock.Sky, (int) entity.posX, (int) entity.posY, (int) entity.posZ) > 7) {
entity.setFire(10);
entity.attackEntityFrom(DamageSource.onFire, 2);
}
if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode)
continue;