upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize imports

Browse Source
This commit is contained in:
TheCricket committed 2014-12-11 20:09:54 -05:00
1 parent 7525123aad
commit d703d5bae1
48 files changed
+93 -171
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle
+1 -1
View File
@@ -23,7 +23,7 @@ group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guid
archivesBaseName = "Chisel 2"
minecraft {
version = "1.7.10-10.13.0.1207"
version = "1.7.10-10.13.2.1230"
runDir = "run"
replaceIn "Chisel.java"
src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
+3 -4
View File
@@ -1,14 +1,13 @@
package info.jbcs.minecraft.chisel;
import info.jbcs.minecraft.chisel.utils.General;
import java.util.HashMap;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.GameRegistry;
import info.jbcs.minecraft.chisel.utils.General;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import java.util.HashMap;
public class BlockNameConversion
{
static final private HashMap<String, String> namingConversion = new HashMap<String, String>();
src/main/java/info/jbcs/minecraft/chisel/Packets.java
-9
View File
@@ -1,14 +1,5 @@
package info.jbcs.minecraft.chisel;
import java.io.IOException;
import info.jbcs.minecraft.chisel.carving.Carving;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
public class Packets// extends MessageHandlerBase
{
src/main/java/info/jbcs/minecraft/chisel/Waila.java
-4
View File
@@ -1,15 +1,11 @@
package info.jbcs.minecraft.chisel;
import info.jbcs.minecraft.chisel.block.BlockAutoChisel;
import info.jbcs.minecraft.chisel.block.BlockCarvable;
import info.jbcs.minecraft.chisel.block.BlockMarbleSlab;
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.List;
src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
-1
View File
@@ -16,7 +16,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java
+4 -5
View File
@@ -1,16 +1,15 @@
package info.jbcs.minecraft.chisel.block;
import java.util.Random;
import net.minecraft.block.Block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockMarbleBookshelf extends BlockCarvable
{
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java
+3 -4
View File
@@ -1,12 +1,9 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.Chisel;
import java.util.List;
import info.jbcs.minecraft.chisel.init.ModTabs;
import net.minecraft.block.BlockCarpet;
import net.minecraft.block.material.Material;
@@ -16,6 +13,8 @@ import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockMarbleCarpet extends BlockCarpet implements ICarvable
{
public CarvableHelper carverHelper;
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
+2 -7
View File
@@ -3,24 +3,19 @@ package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.Chisel;
import java.util.List;
import java.util.Random;
import info.jbcs.minecraft.chisel.init.ModTabs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockIce;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.List;
public class BlockMarbleIce extends BlockIce implements ICarvable
{
public CarvableHelper carverHelper;
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java
+2 -3
View File
@@ -1,14 +1,13 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import java.util.Random;
import info.jbcs.minecraft.chisel.init.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import java.util.Random;
public class BlockMarbleIceStairs extends BlockMarbleStairs
{
public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper)
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java
+2 -3
View File
@@ -4,9 +4,6 @@ import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer;
import java.util.List;
import info.jbcs.minecraft.chisel.init.ModTabs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
@@ -19,6 +16,8 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import java.util.List;
public class BlockMarbleStairs extends BlockStairs implements ICarvable
{
CarvableHelper carverHelper;
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java
+1 -1
View File
@@ -1,12 +1,12 @@
package info.jbcs.minecraft.chisel.block;
import cpw.mods.fml.common.registry.GameRegistry;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.item.ItemCarvable;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import cpw.mods.fml.common.registry.GameRegistry;
public class BlockMarbleStairsMaker
{
src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java
+2 -4
View File
@@ -1,10 +1,6 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.Chisel;
import java.util.List;
import info.jbcs.minecraft.chisel.init.ModTabs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockWall;
@@ -13,6 +9,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import java.util.List;
public class BlockMarbleWall extends BlockWall
{
CarvableHelper carverHelper;
src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java
+2 -3
View File
@@ -1,9 +1,6 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
import java.util.List;
import info.jbcs.minecraft.chisel.init.ModTabs;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -16,6 +13,8 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import java.util.List;
public class BlockSnakestone extends Block
{
static final int SEC_HEAD = 0;
src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java
+2 -3
View File
@@ -2,13 +2,12 @@ package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
import java.util.Random;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.Random;
public class BlockSnakestoneObsidian extends BlockSnakestone
{
public IIcon[] particles = new IIcon[8];
src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java
+15 -6
View File
@@ -1,10 +1,10 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
import info.jbcs.minecraft.chisel.init.ModTabs;
import info.jbcs.minecraft.chisel.utils.General;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -12,13 +12,22 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class BlockVoidstone extends Block implements ICarvable {
import java.util.Random;
public class BlockVoidstone extends Block implements ICarvable{
public CarvableHelper carverHelper;
public static IIcon iconParticle;
public BlockVoidstone() {
super(Material.rock);
carvableHelper = new CarvableHelper();
carverHelper = new CarvableHelper();
setHardness(5.0F);
setResistance(10.0F);
setCreativeTab(ModTabs.tabChiselBlocks);
}
@Override
public void registerBlockIcons(IIconRegister icon){
iconParticle = icon.registerIcon(Chisel.MOD_ID + ":voidstone/particles/star");
}
@Override
@@ -27,9 +36,9 @@ public class BlockVoidstone extends Block implements ICarvable {
if(General.rand.nextInt(4) == 0 && world.isRemote)
GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
}
@Override
public CarvableVariation getVariation(int metadata) {
return carvableHelper.getVariation(metadata);
return carverHelper.getVariation(metadata);
}
}
src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java
+2 -15
View File
@@ -3,20 +3,15 @@ package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
import info.jbcs.minecraft.chisel.init.ModTabs;
import info.jbcs.minecraft.chisel.utils.General;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.Random;
public class BlockVoidstonePillar extends Block implements ICarvable{
public class BlockVoidstonePillar extends Block implements ICarvable {
public static IIcon iconParticle, topBottom, pillarSide;
public static IIcon topBottom, pillarSide;
public static CarvableHelper carvableHelper;
public BlockVoidstonePillar() {
@@ -27,13 +22,6 @@ public class BlockVoidstonePillar extends Block implements ICarvable {
setCreativeTab(ModTabs.tabChiselBlocks);
}
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random random)
{
if(General.rand.nextInt(4) == 0 && world.isRemote)
GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
}
@Override
public IIcon getIcon(int side, int meta){
if(side == 0 || side == 1){
@@ -46,7 +34,6 @@ public class BlockVoidstonePillar extends Block implements ICarvable {
@Override
public void registerBlockIcons(IIconRegister icon){
iconParticle = icon.registerIcon("Chisel:voidstone/particles/star");
topBottom = icon.registerIcon("Chisel:voidstone/pillar-top");
pillarSide = icon.registerIcon("Chisel:voidstone/pillar-side");
}
src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
+1 -2
View File
@@ -25,7 +25,6 @@ import java.util.Set;
public class CarvableHelper
{
static final String modName = "chisel";
public static final ArrayList<Block> chiselBlocks = new ArrayList<Block>();
public static final int NORMAL = 0;
@@ -87,7 +86,7 @@ public class CarvableHelper
{
variation.texture = texture;
String path = "/assets/" + modName + "/textures/blocks/" + variation.texture;
String path = "/assets/" + Chisel.MOD_ID + "/textures/blocks/" + variation.texture;
boolean any = Chisel.class.getResource(path + ".png") != null;
boolean ctm3 = Chisel.class.getResource(path + "-ctm1.png") != null && Chisel.class.getResource(path + "-ctm2.png") != null && Chisel.class.getResource(path + "-ctm3.png") != null;
src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java
+1 -1
View File
@@ -1,11 +1,11 @@
package info.jbcs.minecraft.chisel.carving;
import info.jbcs.minecraft.chisel.Chisel;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import info.jbcs.minecraft.chisel.Chisel;
import java.util.ArrayList;
import java.util.Collections;
src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java
+2 -6
View File
@@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.Configurations;
import info.jbcs.minecraft.chisel.block.BlockHolystone;
import info.jbcs.minecraft.chisel.block.BlockLavastone;
import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar;
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX;
import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX;
import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
@@ -64,9 +64,6 @@ public class GeneralChiselClient {
if (world.getBlock(x, y, z).isOpaqueCube()) return;
EntityLavaFX res = new EntityLavaFX(world, x1, y1, z1);
// res.motionX=x1-x-0.5;
// res.motionY=y1-y-0.5;
// res.motionZ=z1-z-0.5;
double multiplier = 0.45;
res.motionX = -multiplier * (x1 - x - 0.5);
res.motionY = multiplier * (y1 - y - 0.5);
@@ -123,7 +120,7 @@ public class GeneralChiselClient {
}
}
public static void spawnVoidstoneFX(World world, BlockVoidstonePillar block, int x, int y, int z) {
public static void spawnVoidstoneFX(World world, BlockVoidstone block, int x, int y, int z) {
if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) {
float f = 0.15F;
double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) + f + block.getBlockBoundsMinX();
@@ -206,7 +203,6 @@ public class GeneralChiselClient {
}
EntityDiggingFX res = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, block, world.getBlockMetadata(x, y, z), side);
// res.func_70596_a(x, y, z);
res.motionX = d0 - (x + 0.5);
res.motionY = d1 - (y + 0.5);
res.motionZ = d2 - (z + 0.5);
src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java
-1
View File
@@ -7,7 +7,6 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11;
public class GuiChisel extends GuiContainer
src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java
+2 -2
View File
@@ -1,9 +1,9 @@
package info.jbcs.minecraft.chisel.client.gui;
import java.util.ArrayList;
import org.lwjgl.opengl.GL11;
import java.util.ArrayList;
public class GuiElement
{
public int x;
src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java
-1
View File
@@ -7,7 +7,6 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.inventory.Container;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java
-1
View File
@@ -3,7 +3,6 @@ package info.jbcs.minecraft.chisel.client.gui;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.Tessellator;
import org.lwjgl.opengl.GL11;
public class GuilScrolledBox extends GuiElement
src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java
-1
View File
@@ -3,7 +3,6 @@ package info.jbcs.minecraft.chisel.client.gui;
import info.jbcs.minecraft.chisel.utils.GeneralClient;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import org.lwjgl.input.Mouse;
public abstract class Scrollbar extends GuiButton
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java
+3 -7
View File
@@ -1,21 +1,17 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.api.ICarvable;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.client.render.RenderBlocksCTM;
import info.jbcs.minecraft.chisel.client.render.RenderBlocksColumn;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockAdvancedMarbleRenderer implements ISimpleBlockRenderingHandler
{
public RenderBlocksCTM rendererCTM = new RenderBlocksCTM();
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java
+1 -1
View File
@@ -1,7 +1,7 @@
package info.jbcs.minecraft.chisel.client.render;
import info.jbcs.minecraft.chisel.Chisel;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.Chisel;
public class BlockCarpetRenderer extends BlockAdvancedMarbleRenderer
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java
+2 -5
View File
@@ -1,17 +1,14 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.Chisel;
import info.jbcs.minecraft.chisel.client.render.RenderBlocksEldritch;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler
{
public BlockEldritchRenderer()
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java
+2 -4
View File
@@ -1,5 +1,7 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.block.BlockPane;
@@ -8,12 +10,8 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockMarblePaneRenderer implements ISimpleBlockRenderingHandler
{
public static int id;
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java
+3 -5
View File
@@ -1,17 +1,15 @@
package info.jbcs.minecraft.chisel.client.render;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.block.BlockMarblePillar;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockMarblePillarRenderer implements ISimpleBlockRenderingHandler
{
public static int id;
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java
+2 -4
View File
@@ -1,16 +1,14 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.block.BlockMarbleStairs;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockMarbleStairsRenderer implements ISimpleBlockRenderingHandler
{
public static int id;
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java
+2 -4
View File
@@ -1,15 +1,13 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockNoCTMRenderer implements ISimpleBlockRenderingHandler
{
static int id;
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java
+2 -2
View File
@@ -1,5 +1,7 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.block.BlockRoadLine;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
@@ -8,8 +10,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler
{
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java
+2 -4
View File
@@ -1,16 +1,14 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.block.BlockSnakestone;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockSnakeStoneRenderer implements ISimpleBlockRenderingHandler
{
public static int id;
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java
+4 -5
View File
@@ -1,17 +1,16 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.init.ModBlocks;
import info.jbcs.minecraft.chisel.utils.Drawing;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import java.util.Random;
public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler
{
src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java
+2 -4
View File
@@ -1,17 +1,15 @@
package info.jbcs.minecraft.chisel.client.render;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import info.jbcs.minecraft.chisel.block.BlockTexturedOre;
import info.jbcs.minecraft.chisel.utils.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler
{
float bot = -0.001f, top = 1.0f - bot;
src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java
+1 -1
View File
@@ -1,8 +1,8 @@
package info.jbcs.minecraft.chisel.client.render;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.IIcon;
public class TextureVirtual implements IIcon
{
src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java
-1
View File
@@ -6,7 +6,6 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
public class ItemChiselRenderer implements IItemRenderer
src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java
+2 -2
View File
@@ -1,13 +1,13 @@
package info.jbcs.minecraft.chisel.entity;
import java.util.Random;
import info.jbcs.minecraft.chisel.init.ModBlocks;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import java.util.Random;
public class EntityCloudInABottle extends EntityThrowable
{
Random rand = new Random();
src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java
+2 -5
View File
@@ -1,6 +1,7 @@
package info.jbcs.minecraft.chisel.entity.fx;
import info.jbcs.minecraft.chisel.Chisel;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
import info.jbcs.minecraft.chisel.init.ModItems;
import info.jbcs.minecraft.chisel.utils.General;
@@ -8,12 +9,8 @@ import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class EntityBallOMossFX extends EntityFX
{
BlockSnakestoneObsidian block;
src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java
-1
View File
@@ -5,7 +5,6 @@ import info.jbcs.minecraft.chisel.utils.General;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
public class EntitySnakestoneObsidianFX extends EntityFX
src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java
+2 -2
View File
@@ -1,6 +1,6 @@
package info.jbcs.minecraft.chisel.entity.fx;
import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar;
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
import info.jbcs.minecraft.chisel.utils.General;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
@@ -12,7 +12,7 @@ public class EntityVoidstoneFX extends EntityFX {
float initialScale;
float angleOffset;
public EntityVoidstoneFX(World world, BlockVoidstonePillar blockVoidstone, double x, double y, double z) {
public EntityVoidstoneFX(World world, BlockVoidstone blockVoidstone, double x, double y, double z) {
super(world, x, y, z, 0, 0, 0);
initialScale = 1.0F + 1.0F * General.rand.nextFloat();
angleOffset = rand.nextFloat() * 360;
src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java
+2 -2
View File
@@ -1318,11 +1318,11 @@ public class ModBlocks {
}
if(Configurations.featureEnabled("voidstone")){
voidstone = (BlockVoidstone) new BlockVoidstone(Material.rock, Chisel.MOD_ID + ":void").setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone);
voidstone = (BlockVoidstone) new BlockVoidstone().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks);
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/metalborder");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls"
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/rune");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/raw");
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/eye");
src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java
-1
View File
@@ -2,7 +2,6 @@ package info.jbcs.minecraft.chisel.inventory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java
-1
View File
@@ -15,7 +15,6 @@ import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle;
import info.jbcs.minecraft.chisel.entity.EntitySmashingRock;
import info.jbcs.minecraft.chisel.init.ModBlocks;
import info.jbcs.minecraft.chisel.init.ModItems;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.item.Item;
import net.minecraftforge.client.MinecraftForgeClient;
src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java
+2 -4
View File
@@ -1,15 +1,13 @@
package info.jbcs.minecraft.chisel.utils;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler
{
float bot = -0.001f, top = 1.0f - bot;
src/main/java/info/jbcs/minecraft/chisel/utils/General.java
+2 -3
View File
@@ -1,8 +1,5 @@
package info.jbcs.minecraft.chisel.utils;
import java.util.HashMap;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,6 +11,8 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import java.util.Random;
public class General
{
public static Random rand = new Random();
src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java
+3 -10
View File
@@ -1,21 +1,14 @@
package info.jbcs.minecraft.chisel.utils;
import java.util.HashMap;
import java.util.Random;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import scala.collection.parallel.ParIterableLike;
import java.util.HashMap;
import java.util.Random;
public class GeneralClient
{
src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java
+5 -5
View File
@@ -1,13 +1,13 @@
package info.jbcs.minecraft.chisel.utils;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collections;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
public abstract class GuiHandler implements Comparable
{
static ArrayList<GuiHandler> items = new ArrayList<GuiHandler>();