mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-21 20:52:26 +00:00
Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct
This commit is contained in:
commit
2feefaa6f5
3 files changed
+23
-27
No files matched your search
@@ -32,7 +32,7 @@ public class GlassPaneConnected extends GlassBlockConnected {
|
||||
@Override
|
||||
public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) {
|
||||
if (par5 == 0 || par5 == 1) {
|
||||
return getSideTextureIndex();
|
||||
return par1IBlockAccess.getBlockId(par2, par3 - 1, par4) == this.blockID && par5 == 0 ? icons[15] : par1IBlockAccess.getBlockId(par2, par3 + 1, par4) == this.blockID && par5 == 1 ? icons[15] : getSideTextureIndex();
|
||||
} else {
|
||||
return super.getBlockTexture(par1IBlockAccess, par2, par3, par4, par5);
|
||||
}
|
||||
@@ -444,11 +444,11 @@ public class GlassPaneConnected extends GlassBlockConnected {
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) {
|
||||
if(par5 == 0 || par5 == 1){
|
||||
return par1IBlockAccess.getBlockId(par2, par3, par4) != this.blockID;
|
||||
}else{
|
||||
return true;
|
||||
}
|
||||
// return true;
|
||||
// if(par5 == 0 || par5 == 1){
|
||||
// return par1IBlockAccess.getBlockId(par2, par3, par4) != this.blockID;
|
||||
// }else{
|
||||
// return true;
|
||||
// }
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,36 +1,27 @@
|
||||
package tconstruct.client;
|
||||
|
||||
import cpw.mods.fml.relauncher.*;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.SoundPool;
|
||||
import net.minecraft.client.audio.SoundManager;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.*;
|
||||
import net.minecraft.entity.ai.attributes.AttributeInstance;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.potion.*;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraftforge.client.GuiIngameForge;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
import net.minecraftforge.client.event.*;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.client.event.sound.SoundLoadEvent;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.LiquidMetalFinite;
|
||||
import tconstruct.blocks.slime.SlimeFluid;
|
||||
import tconstruct.client.armor.WingModel;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TClientEvents
|
||||
@@ -49,10 +40,10 @@ public class TClientEvents
|
||||
initSounds = true;
|
||||
try
|
||||
{
|
||||
SoundPool soundpool = event.manager.soundPoolSounds;
|
||||
soundpool.addSound("tinker:frypan_hit.ogg");
|
||||
soundpool.addSound("tinker:little_saw.ogg");
|
||||
soundpool.addSound("tinker:launcher_clank.ogg");
|
||||
SoundManager soundmanager = event.manager;
|
||||
soundmanager.addSound("tinker:frypan_hit.ogg");
|
||||
soundmanager.addSound("tinker:little_saw.ogg");
|
||||
soundmanager.addSound("tinker:launcher_clank.ogg");
|
||||
System.out.println("[TConstruct] Successfully loaded sounds.");
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
@@ -25,6 +25,9 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler {
|
||||
|
||||
@Override
|
||||
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
|
||||
boolean temp = renderer.renderAllFaces;
|
||||
renderer.renderAllFaces = true;
|
||||
|
||||
GlassPaneConnected pane = (GlassPaneConnected)block;
|
||||
|
||||
boolean flag = pane.canPaneConnectTo(world, x, y, z, EAST);
|
||||
@@ -69,6 +72,8 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler {
|
||||
|
||||
|
||||
renderer.clearOverrideBlockTexture();
|
||||
|
||||
renderer.renderAllFaces = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user