mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-12 00:07:37 +00:00
1 parent
27c532a4fc
commit
c5edcf2f0c
139 files changed
+500
-577
No files matched your search
@@ -1,8 +0,0 @@
|
||||
package com.cricketcraft.minecraft.chisel.api;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
|
||||
public interface ICarvable
|
||||
{
|
||||
public CarvableVariation getVariation(int metadata);
|
||||
}
|
||||
+3
-4
@@ -1,12 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
+26
-27
@@ -1,4 +1,25 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.BlockCarvable;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.client.gui.GuiChisel;
|
||||
import info.jbcs.minecraft.chisel.client.gui.GuiPresent;
|
||||
import info.jbcs.minecraft.chisel.compat.Compatibility;
|
||||
import info.jbcs.minecraft.chisel.compat.FMPIntegration;
|
||||
import info.jbcs.minecraft.chisel.compat.ModIntegration;
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import info.jbcs.minecraft.chisel.init.ModItems;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerChisel;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerPresent;
|
||||
import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection;
|
||||
import info.jbcs.minecraft.chisel.proxy.CommonProxy;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
import info.jbcs.minecraft.chisel.world.GeneratorLimestone;
|
||||
import info.jbcs.minecraft.chisel.world.GeneratorMarble;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@@ -9,28 +30,6 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockCarvable;
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import com.cricketcraft.minecraft.chisel.client.gui.GuiAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.client.gui.GuiChisel;
|
||||
import com.cricketcraft.minecraft.chisel.client.gui.GuiPresent;
|
||||
import com.cricketcraft.minecraft.chisel.compat.Compatibility;
|
||||
import com.cricketcraft.minecraft.chisel.compat.FMPIntegration;
|
||||
import com.cricketcraft.minecraft.chisel.compat.ModIntegration;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModItems;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection;
|
||||
import com.cricketcraft.minecraft.chisel.proxy.CommonProxy;
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
import com.cricketcraft.minecraft.chisel.world.GeneratorLimestone;
|
||||
import com.cricketcraft.minecraft.chisel.world.GeneratorMarble;
|
||||
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
@@ -53,11 +52,11 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;")
|
||||
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;")
|
||||
public class Chisel
|
||||
{
|
||||
public static final String MOD_ID = "chisel";
|
||||
public static final BlockCarvable.SoundType soundTempleFootstep = new com.cricketcraft.minecraft.chisel.block.BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f);
|
||||
public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f);
|
||||
public static final String MOD_NAME = "Chisel 2";
|
||||
public static final String VERSION = "2.1.3";
|
||||
public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f);
|
||||
@@ -70,7 +69,7 @@ public class Chisel
|
||||
@Instance(MOD_ID)
|
||||
public static Chisel instance;
|
||||
|
||||
@SidedProxy(clientSide = "com.cricketcraft.minecraft.chisel.proxy.ClientProxy", serverSide = "com.cricketcraft.minecraft.chisel.proxy.CommonProxy")
|
||||
@SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -186,7 +185,7 @@ public class Chisel
|
||||
MinecraftForge.EVENT_BUS.register(new ChiselLeftClick());
|
||||
FMLCommonHandler.instance().bus().register(instance);
|
||||
|
||||
FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.minecraft.chisel.Waila.register");
|
||||
FMLInterModComms.sendMessage("Waila", "register", "info.jbcs.minecraft.chisel.Waila.register");
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
+8
-9
@@ -1,4 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import info.jbcs.minecraft.chisel.api.ChiselMode;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvingVariation;
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import info.jbcs.minecraft.chisel.init.ModItems;
|
||||
import info.jbcs.minecraft.chisel.item.ItemChisel;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Random;
|
||||
@@ -12,14 +19,6 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ChiselMode;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvingVariation;
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModItems;
|
||||
import com.cricketcraft.minecraft.chisel.item.ItemChisel;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
+3
-5
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import info.jbcs.minecraft.chisel.init.ModItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -8,10 +10,6 @@ import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class Crafting {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
public class Packets// extends MessageHandlerBase
|
||||
{
|
||||
+3
-3
@@ -1,4 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel;
|
||||
package info.jbcs.minecraft.chisel;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.BlockCarvable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -8,8 +10,6 @@ import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.IWailaRegistrar;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockCarvable;
|
||||
|
||||
public class Waila implements IWailaDataProvider
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.api;
|
||||
package info.jbcs.minecraft.chisel.api;
|
||||
|
||||
public enum ChiselMode
|
||||
{
|
||||
@@ -0,0 +1,8 @@
|
||||
package info.jbcs.minecraft.chisel.api;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
|
||||
|
||||
public interface ICarvable
|
||||
{
|
||||
public CarvableVariation getVariation(int metadata);
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.api;
|
||||
package info.jbcs.minecraft.chisel.api;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.api;
|
||||
package info.jbcs.minecraft.chisel.api;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
+6
-7
@@ -1,4 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import info.jbcs.minecraft.chisel.init.ModItems;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
@@ -14,12 +19,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModItems;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
+7
-8
@@ -1,4 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -9,13 +15,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+7
-8
@@ -1,4 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+7
-8
@@ -1,4 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.render.BlockMarblePaneRenderer;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
+4
-6
@@ -1,13 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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 net.minecraft.block.BlockPumpkin;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+3
-3
@@ -1,6 +1,8 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -10,8 +12,6 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
|
||||
public class BlockCloud extends BlockCarvable {
|
||||
|
||||
public BlockCloud() {
|
||||
+3
-5
@@ -1,12 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
|
||||
|
||||
public class BlockEldritch extends BlockCarvable
|
||||
+6
-6
@@ -1,4 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -7,11 +12,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
|
||||
public class BlockGrimstone extends BlockCarvable {
|
||||
public IIcon iconStar;
|
||||
|
||||
+4
-4
@@ -1,4 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -7,9 +10,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
|
||||
public class BlockHolystone extends BlockCarvable {
|
||||
public IIcon iconStar;
|
||||
|
||||
+3
-3
@@ -1,13 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
|
||||
public class BlockLavastone extends BlockMarbleTexturedOre
|
||||
{
|
||||
public BlockLavastone(Material mat, String baseIcon)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
+7
-7
@@ -1,4 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -10,12 +16,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockMarbleCarpet extends BlockCarpet implements ICarvable
|
||||
{
|
||||
public CarvableHelper carverHelper;
|
||||
+6
-6
@@ -1,4 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -12,11 +17,6 @@ import net.minecraft.stats.StatList;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockMarbleIce extends BlockIce implements ICarvable
|
||||
{
|
||||
public CarvableHelper carverHelper;
|
||||
+4
-4
@@ -1,4 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -6,9 +9,6 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
|
||||
public class BlockMarbleIceStairs extends BlockMarbleStairs
|
||||
{
|
||||
public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
+3
-4
@@ -1,12 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
|
||||
import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer;
|
||||
|
||||
public class BlockMarblePillar extends BlockCarvable {
|
||||
public IIcon sides[] = new IIcon[6];
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
+7
-7
@@ -1,4 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.render.BlockMarbleStairsRenderer;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -13,12 +19,6 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockMarbleStairs extends BlockStairs implements ICarvable
|
||||
{
|
||||
CarvableHelper carverHelper;
|
||||
+4
-6
@@ -1,13 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
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 com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.item.ItemCarvable;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockMarbleStairsMaker
|
||||
+2
-3
@@ -1,9 +1,8 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
|
||||
public interface BlockMarbleStairsMakerCreator
|
||||
{
|
||||
public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper);
|
||||
+6
-6
@@ -1,4 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -9,11 +14,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable
|
||||
{
|
||||
public CarvableHelper carverHelper;
|
||||
+4
-4
@@ -1,4 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -9,9 +12,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockMarbleWall extends BlockWall
|
||||
{
|
||||
CarvableHelper carverHelper;
|
||||
+11
-13
@@ -1,4 +1,12 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.api.ICarvable;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Iterator;
|
||||
@@ -24,15 +32,6 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -391,14 +390,13 @@ public class BlockPresent extends BlockContainer implements ICarvable {
|
||||
return Container.calcRedstoneFromInventory(getInventory(world, x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
this.blockIcon = register.registerIcon("planks_oak");
|
||||
}
|
||||
|
||||
public IInventory getInventory(World world, int x, int y, int z) {
|
||||
Object object = world.getTileEntity(x, y, z);
|
||||
Object object = (TileEntityPresent) world.getTileEntity(x, y, z);
|
||||
|
||||
if (object == null) {
|
||||
return null;
|
||||
+4
-5
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -8,9 +10,6 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockRoadLine extends Block
|
||||
{
|
||||
public IIcon aloneIcon;
|
||||
@@ -54,7 +53,7 @@ public class BlockRoadLine extends Block
|
||||
@Override
|
||||
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone);
|
||||
return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
+4
-4
@@ -1,4 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -13,9 +16,6 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockSnakestone extends Block
|
||||
{
|
||||
static final int SEC_HEAD = 0;
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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 com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
|
||||
public class BlockSnakestoneObsidian extends BlockSnakestone
|
||||
{
|
||||
public IIcon[] particles = new IIcon[8];
|
||||
+5
-7
@@ -1,5 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer;
|
||||
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;
|
||||
@@ -8,12 +12,6 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer;
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
+2
-4
@@ -1,13 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer;
|
||||
|
||||
public class BlockTexturedOre extends Block
|
||||
{
|
||||
public int currentPass;
|
||||
+8
-8
@@ -1,4 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.utils.General;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -8,13 +15,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.minecraft.chisel.utils.General;
|
||||
|
||||
public class BlockVoidstone extends Block implements ICarvable{
|
||||
public CarvableHelper carverHelper;
|
||||
public IIcon iconParticle;
|
||||
+5
-6
@@ -1,15 +1,14 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
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.init.ModTabs;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModTabs;
|
||||
|
||||
public class BlockVoidstonePillar extends Block implements ICarvable{
|
||||
|
||||
public static IIcon topBottom, pillarSide;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block;
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.block.tileentity;
|
||||
package info.jbcs.minecraft.chisel.block.tileentity;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
+5
-5
@@ -1,4 +1,8 @@
|
||||
package com.cricketcraft.minecraft.chisel.block.tileentity;
|
||||
package info.jbcs.minecraft.chisel.block.tileentity;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.BlockPresent;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerPresent;
|
||||
import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -9,10 +13,6 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.tileentity.TileEntityChest;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockPresent;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent;
|
||||
|
||||
public class TileEntityPresent extends TileEntityChest {
|
||||
|
||||
public TileEntityPresent() {
|
||||
+10
-11
@@ -1,4 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.carving;
|
||||
package info.jbcs.minecraft.chisel.carving;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.block.BlockMarbleSlab;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM;
|
||||
import info.jbcs.minecraft.chisel.client.render.CTM;
|
||||
import info.jbcs.minecraft.chisel.client.render.TextureSubmap;
|
||||
import info.jbcs.minecraft.chisel.item.ItemCarvable;
|
||||
import info.jbcs.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
@@ -13,16 +22,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.CTM;
|
||||
import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap;
|
||||
import com.cricketcraft.minecraft.chisel.item.ItemCarvable;
|
||||
import com.cricketcraft.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class CarvableHelper
|
||||
+2
-3
@@ -1,10 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.carving;
|
||||
package info.jbcs.minecraft.chisel.carving;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.render.TextureSubmap;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap;
|
||||
|
||||
public class CarvableVariation
|
||||
{
|
||||
public String blockName;
|
||||
+3
-3
@@ -1,4 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.carving;
|
||||
package info.jbcs.minecraft.chisel.carving;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
@@ -10,8 +12,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
|
||||
public class Carving
|
||||
{
|
||||
HashMap<String, CarvingGroup> carvingGroupsByName = new HashMap<String, CarvingGroup>();
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.carving;
|
||||
package info.jbcs.minecraft.chisel.carving;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.carving;
|
||||
package info.jbcs.minecraft.chisel.carving;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
+14
-14
@@ -1,4 +1,17 @@
|
||||
package com.cricketcraft.minecraft.chisel.client;
|
||||
package info.jbcs.minecraft.chisel.client;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.block.BlockGrimstone;
|
||||
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.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityGrimstoneFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityVoidstoneFX;
|
||||
import info.jbcs.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -11,19 +24,6 @@ import net.minecraft.client.particle.EntityLavaFX;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockGrimstone;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockHolystone;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockLavastone;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian;
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockVoidstone;
|
||||
import com.cricketcraft.minecraft.chisel.entity.fx.EntityBallOMossFX;
|
||||
import com.cricketcraft.minecraft.chisel.entity.fx.EntityGrimstoneFX;
|
||||
import com.cricketcraft.minecraft.chisel.entity.fx.EntityHolystoneFX;
|
||||
import com.cricketcraft.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
|
||||
import com.cricketcraft.minecraft.chisel.entity.fx.EntityVoidstoneFX;
|
||||
import com.cricketcraft.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
|
||||
public class GeneralChiselClient {
|
||||
public static Random rand = new Random();
|
||||
+3
-4
@@ -1,14 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel;
|
||||
|
||||
public class GuiAutoChisel extends GuiContainer {
|
||||
|
||||
private static final ResourceLocation gui = new ResourceLocation("chisel:textures/autochisel-gui.png");
|
||||
+4
-5
@@ -1,5 +1,8 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerChisel;
|
||||
import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection;
|
||||
import info.jbcs.minecraft.chisel.utils.GeneralClient;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -7,10 +10,6 @@ import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection;
|
||||
import com.cricketcraft.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
public class GuiChisel extends GuiContainer
|
||||
{
|
||||
public EntityPlayer player;
|
||||
+3
-5
@@ -1,12 +1,10 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraftforge.common.config.ConfigElement;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.Configurations;
|
||||
|
||||
import cpw.mods.fml.client.config.GuiConfig;
|
||||
|
||||
public class GuiChiselConfig extends GuiConfig
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class GuiExButton extends GuiElement
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class GuiLabel extends GuiElement
|
||||
{
|
||||
+3
-4
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import info.jbcs.minecraft.chisel.inventory.ContainerPresent;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
@@ -7,9 +9,6 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent;
|
||||
|
||||
public class GuiPresent extends GuiContainer {
|
||||
private static final ResourceLocation gui = new ResourceLocation("chisel:textures/present-gui.png");
|
||||
private IInventory upper, lower;
|
||||
+3
-4
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import info.jbcs.minecraft.chisel.utils.DummyContainer;
|
||||
import info.jbcs.minecraft.chisel.utils.GeneralClient;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
@@ -10,9 +12,6 @@ import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.input.Mouse;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.utils.DummyContainer;
|
||||
import com.cricketcraft.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
public class GuiScreenPlus extends GuiContainer
|
||||
{
|
||||
public int screenW;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class InputEvent
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class InputKeyboardEvent extends InputEvent
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class InputMouseEvent extends InputEvent
|
||||
{
|
||||
+2
-3
@@ -1,12 +1,11 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
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;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.utils.GeneralClient;
|
||||
|
||||
public abstract class Scrollbar extends GuiButton
|
||||
{
|
||||
public boolean active;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.gui;
|
||||
package info.jbcs.minecraft.chisel.client.gui;
|
||||
|
||||
public class TexturedBox
|
||||
{
|
||||
+2
-3
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.model;
|
||||
package info.jbcs.minecraft.chisel.client.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
@@ -99,8 +99,7 @@ public class ModelAutoChisel extends ModelBase
|
||||
setRotation(Shape12, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||
{
|
||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
||||
+6
-7
@@ -1,17 +1,16 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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.utils.Drawing;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+2
-3
@@ -1,7 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
|
||||
+12
-13
@@ -1,14 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
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 com.cricketcraft.minecraft.chisel.Chisel;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
@@ -51,8 +50,8 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler
|
||||
double v1 = icon.getMinV();
|
||||
double uu = icon.getInterpolatedU(8.0D);
|
||||
double vv = icon.getInterpolatedV(8.0D);
|
||||
|
||||
|
||||
|
||||
|
||||
int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z);
|
||||
int lym=block.getMixedBrightnessForBlock(world, x, y-1, z);
|
||||
int lxp=block.getMixedBrightnessForBlock(world, x+1, y, z);
|
||||
@@ -62,11 +61,11 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -77,14 +76,14 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler
|
||||
u1 = icon.getMaxU();
|
||||
v1 = icon.getMaxV();
|
||||
vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1);
|
||||
|
||||
|
||||
icon = block.getIcon(1, meta);
|
||||
u0 = icon.getMinU();
|
||||
v0 = icon.getMinV();
|
||||
u1 = icon.getMaxU();
|
||||
v1 = icon.getMaxV();
|
||||
vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0);
|
||||
|
||||
|
||||
*/
|
||||
|
||||
renderer.blockAccess = world;
|
||||
+2
-3
@@ -1,5 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.utils.Drawing;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockPane;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
@@ -10,8 +11,6 @@ import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+4
-5
@@ -1,15 +1,14 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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 com.cricketcraft.minecraft.chisel.block.BlockMarblePillar;
|
||||
import com.cricketcraft.minecraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+3
-4
@@ -1,14 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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 com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+2
-3
@@ -1,13 +1,12 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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 com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+3
-5
@@ -1,15 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.BlockRoadLine;
|
||||
import info.jbcs.minecraft.chisel.utils.Drawing;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockRoadLine;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+3
-4
@@ -1,14 +1,13 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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 com.cricketcraft.minecraft.chisel.block.BlockSnakestone;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+4
-5
@@ -1,4 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import info.jbcs.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -7,10 +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 com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+3
-4
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
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;
|
||||
@@ -7,9 +9,6 @@ import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockTexturedOre;
|
||||
import com.cricketcraft.minecraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
+2
-3
@@ -1,10 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import info.jbcs.minecraft.chisel.api.IFacade;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.api.IFacade;
|
||||
|
||||
public class CTM
|
||||
{
|
||||
static int submaps[][] = {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.util.IIcon;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render;
|
||||
package info.jbcs.minecraft.chisel.client.render;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
+2
-3
@@ -1,13 +1,12 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render.item;
|
||||
package info.jbcs.minecraft.chisel.client.render.item;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class ItemAutoChiselRenderer implements IItemRenderer{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render.item;
|
||||
package info.jbcs.minecraft.chisel.client.render.item;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
+2
-3
@@ -1,5 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render.item;
|
||||
package info.jbcs.minecraft.chisel.client.render.item;
|
||||
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import net.minecraft.client.model.ModelChest;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -7,8 +8,6 @@ import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.Chisel;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class ItemPresentRenderer implements IItemRenderer {
|
||||
+3
-4
@@ -1,10 +1,12 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render.tile;
|
||||
package info.jbcs.minecraft.chisel.client.render.tile;
|
||||
|
||||
import static org.lwjgl.opengl.GL11.glPopMatrix;
|
||||
import static org.lwjgl.opengl.GL11.glPushMatrix;
|
||||
import static org.lwjgl.opengl.GL11.glRotatef;
|
||||
import static org.lwjgl.opengl.GL11.glScalef;
|
||||
import static org.lwjgl.opengl.GL11.glTranslatef;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -16,9 +18,6 @@ import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+4
-5
@@ -1,5 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.client.render.tile;
|
||||
package info.jbcs.minecraft.chisel.client.render.tile;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.BlockPresent;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockChest;
|
||||
import net.minecraft.client.model.ModelChest;
|
||||
@@ -10,9 +12,6 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.block.BlockPresent;
|
||||
import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
|
||||
public class RenderPresent extends TileEntityChestRenderer {
|
||||
@@ -91,7 +90,7 @@ public class RenderPresent extends TileEntityChestRenderer {
|
||||
GL11.glTranslatef(0.0F, 0.0F, -1.0F);
|
||||
}
|
||||
|
||||
GL11.glRotatef(short1, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef((float) short1, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
|
||||
float f1 = present.prevLidAngle + (present.lidAngle - present.prevLidAngle) * partialTicks;
|
||||
float f2;
|
||||
+3
-4
@@ -1,7 +1,6 @@
|
||||
package com.cricketcraft.minecraft.chisel.compat;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.Carving;
|
||||
package info.jbcs.minecraft.chisel.compat;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.Carving;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -15,7 +14,7 @@ public class Compatibility
|
||||
|
||||
addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99);
|
||||
addSupport("bluepower", "marble", "marble", 0, 99);
|
||||
|
||||
|
||||
addSupport("PFAAGeologica", "strongStone", "marble", 5, 99);
|
||||
addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99);
|
||||
addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99);
|
||||
+3
-5
@@ -1,11 +1,9 @@
|
||||
package com.cricketcraft.minecraft.chisel.compat;
|
||||
package info.jbcs.minecraft.chisel.compat;
|
||||
|
||||
import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration;
|
||||
import info.jbcs.minecraft.chisel.init.ModBlocks;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.compat.ModIntegration.IModIntegration;
|
||||
import com.cricketcraft.minecraft.chisel.init.ModBlocks;
|
||||
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
|
||||
public class FMPIntegration implements IModIntegration{
|
||||
+2
-4
@@ -1,9 +1,7 @@
|
||||
package com.cricketcraft.minecraft.chisel.compat;
|
||||
package info.jbcs.minecraft.chisel.compat;
|
||||
|
||||
import info.jbcs.minecraft.chisel.carving.Carving;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
import com.cricketcraft.minecraft.chisel.carving.Carving;
|
||||
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
|
||||
public class MarbleCompatibility
|
||||
Loaded 100 of 139 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user