diff options
author | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-30 04:00:48 +1000 |
---|---|---|
committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-30 04:00:48 +1000 |
commit | b5ba6067230047ba6ab797f977b1d7c2e77deb6d (patch) | |
tree | b55f5250141c349d9945b4b142de94a21d15265c /src/Java/gtPlusPlus/core/world | |
parent | 18bc6994e7c371565007ed5dbdf79300d7025ff7 (diff) | |
download | GT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.tar.gz GT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.tar.bz2 GT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.zip |
+ Added recipe to craft the Activated Alkalus Disk.
+ Added recipe to craft Mystic Frame portal blocks.
% Tweaked Toxic Everglades Portal.
% Tweaked sludge textures.
$ Stopped Mining Explosive using CSPRNG.
Diffstat (limited to 'src/Java/gtPlusPlus/core/world')
-rw-r--r-- | src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java | 35 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java | 3 |
2 files changed, 22 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java index 7e84bf1a8c..e89838e182 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java @@ -5,6 +5,7 @@ import java.util.Random; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; import gtPlusPlus.core.world.darkworld.world.TeleporterDimensionMod; @@ -17,6 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -31,7 +33,7 @@ public class blockDarkWorldPortal extends BlockBreakable { this.setLightLevel(0.75F); this.setCreativeTab(CreativeTabs.tabBlock); this.setBlockName("blockDarkWorldPortal"); - LanguageRegistry.addName(this, "Portal to the Dark World"); + LanguageRegistry.addName(this, "A Glimpse of the Toxic Everglades"); } @@ -302,27 +304,27 @@ public class blockDarkWorldPortal extends BlockBreakable { * A randomly called display update to be able to add particles or other items for display */ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - if (par5Random.nextInt(100) == 0) { + if (CORE.RANDOM.nextInt(100) == 0) { par1World.playSound(par2 + 0.5D, par3 + 0.5D, par4 + 0.5D, "portal.portal", 0.5F, - par5Random.nextFloat() * 0.4F + 0.8F, false); + CORE.RANDOM.nextFloat() * 0.4F + 0.8F, false); } for (int l = 0; l < 4; ++l) { - double d0 = par2 + par5Random.nextFloat(); - double d1 = par3 + par5Random.nextFloat(); - double d2 = par4 + par5Random.nextFloat(); + double d0 = par2 + CORE.RANDOM.nextFloat(); + double d1 = par3 + CORE.RANDOM.nextFloat(); + double d2 = par4 + CORE.RANDOM.nextFloat(); double d3 = 0.0D; double d4 = 0.0D; double d5 = 0.0D; - int i1 = par5Random.nextInt(2) * 2 - 1; - d3 = (par5Random.nextFloat() - 0.5D) * 0.5D; - d4 = (par5Random.nextFloat() - 0.5D) * 0.5D; - d5 = (par5Random.nextFloat() - 0.5D) * 0.5D; + int i1 = CORE.RANDOM.nextInt(2) * 2 - 1; + d3 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; + d4 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; + d5 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; if (par1World.getBlock(par2 - 1, par3, par4) != this && par1World.getBlock(par2 + 1, par3, par4) != this) { d0 = par2 + 0.5D + 0.25D * i1; - d3 = par5Random.nextFloat() * 2.0F * i1; + d3 = CORE.RANDOM.nextFloat() * 2.0F * i1; } else { d2 = par4 + 0.5D + 0.25D * i1; - d5 = par5Random.nextFloat() * 2.0F * i1; + d5 = CORE.RANDOM.nextFloat() * 2.0F * i1; } par1World.spawnParticle("reddust", d0+0.1D, d1, d2, d3, d4, d5); par1World.spawnParticle("smoke", d0, d1+0.1D, d2, 0, 0, 0); @@ -348,12 +350,17 @@ public class blockDarkWorldPortal extends BlockBreakable { @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ - return Utils.rgbtoHexValue(255, 255, 0); + return Utils.rgbtoHexValue(0, 255, 0); } @Override public int getRenderColor(final int aMeta) { - return Utils.rgbtoHexValue(255, 255, 0); + return Utils.rgbtoHexValue(0, 255, 0); + } + + @Override + public String getLocalizedName() { + return EnumChatFormatting.OBFUSCATED+super.getLocalizedName(); } } diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 1daa69bc5a..50fa08f55f 100644 --- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java @@ -2,7 +2,6 @@ package gtPlusPlus.core.world.explosions; import java.util.*; -import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE; import gtPlusPlus.api.objects.XSTR; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; import gtPlusPlus.core.util.math.MathUtils; @@ -22,7 +21,7 @@ public class MiningExplosion extends Explosion { /** whether or not this explosion spawns smoke particles */ public boolean isSmoking = true; private final int field_77289_h = 16; - private final Random explosionRNG = CSPRNG_DO_NOT_USE.generate(new XSTR()); + private final Random explosionRNG = new XSTR(); private final World worldObj; public double explosionX; public double explosionY; |