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

Move to 2.9.0 and update to CTMLib's repackaging

Browse Source
This commit is contained in:
tterrag1098 committed 2015-08-25 22:06:38 -04:00
1 parent 7fc372e335
commit 444ea65b14
23 files changed
+43 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/api/ICarvable.java
+2 -2
View File
@@ -1,11 +1,11 @@
package com.cricketcraft.chisel.api;
import team.chisel.ctmlib.ICTMBlock;
import team.chisel.ctmlib.ISubmapManager;
import net.minecraft.world.IBlockAccess;
import com.cricketcraft.chisel.api.carving.CarvableHelper;
import com.cricketcraft.chisel.api.carving.IVariationInfo;
import com.cricketcraft.ctmlib.ICTMBlock;
import com.cricketcraft.ctmlib.ISubmapManager;
/**
* To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes.
src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java
+1 -1
View File
@@ -3,6 +3,7 @@ package com.cricketcraft.chisel.api.carving;
import java.util.ArrayList;
import java.util.List;
import team.chisel.ctmlib.ISubmapManager;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
@@ -18,7 +19,6 @@ import net.minecraftforge.oredict.OreDictionary;
import com.cricketcraft.chisel.api.ChiselAPIProps;
import com.cricketcraft.chisel.api.FMPIMC;
import com.cricketcraft.chisel.api.rendering.TextureType;
import com.cricketcraft.ctmlib.ISubmapManager;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.cricketcraft.chisel.api.carving;
import team.chisel.ctmlib.ISubmapManager;
import com.cricketcraft.chisel.api.rendering.TextureType;
import com.cricketcraft.ctmlib.ISubmapManager;
public interface IVariationInfo extends ISubmapManager {
src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java
+1 -1
View File
@@ -1,5 +1,6 @@
package com.cricketcraft.chisel.api.carving;
import team.chisel.ctmlib.ISubmapManager;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -9,7 +10,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import com.cricketcraft.chisel.api.rendering.TextureType;
import com.cricketcraft.ctmlib.ISubmapManager;
public class VariationInfoBase implements IVariationInfo {
src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
+6 -5
View File
@@ -15,13 +15,14 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import team.chisel.ctmlib.CTM;
import team.chisel.ctmlib.ISubmapManager;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.RenderBlocksColumn;
import team.chisel.ctmlib.TextureSubmap;
import com.cricketcraft.chisel.api.carving.CarvableHelper;
import com.cricketcraft.chisel.api.carving.ICarvingVariation;
import com.cricketcraft.ctmlib.CTM;
import com.cricketcraft.ctmlib.ISubmapManager;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.RenderBlocksColumn;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/RendererCTM.java
+2 -1
View File
@@ -1,7 +1,8 @@
package team.chisel.client.render;
import team.chisel.ctmlib.CTMRenderer;
import com.cricketcraft.chisel.api.rendering.ClientUtils;
import com.cricketcraft.ctmlib.CTMRenderer;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererCTMPane.java
+1 -2
View File
@@ -10,8 +10,7 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import com.cricketcraft.ctmlib.Drawing;
import team.chisel.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererEldritch.java
+1 -3
View File
@@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import team.chisel.Chisel;
import com.cricketcraft.ctmlib.Drawing;
import team.chisel.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererLayeredGlow.java
+1 -3
View File
@@ -10,10 +10,8 @@ import org.lwjgl.opengl.GL11;
import team.chisel.Chisel;
import team.chisel.block.BlockCarvableGlow;
import team.chisel.config.Configurations;
import team.chisel.ctmlib.Drawing;
import team.chisel.utils.GeneralClient;
import com.cricketcraft.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererMultiLayer.java
+1 -3
View File
@@ -1,14 +1,12 @@
package team.chisel.client.render;
import team.chisel.block.BlockMultiLayerBase;
import team.chisel.ctmlib.Drawing;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.MinecraftForgeClient;
import com.cricketcraft.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import static org.lwjgl.opengl.GL11.*;
src/main/java/team/chisel/client/render/RendererRoadLine.java
+1 -3
View File
@@ -2,15 +2,13 @@ package team.chisel.client.render;
import team.chisel.Chisel;
import team.chisel.block.BlockRoadLine;
import team.chisel.ctmlib.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.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererSimpleLayered.java
+1 -3
View File
@@ -8,9 +8,7 @@ import org.lwjgl.opengl.GL11;
import team.chisel.Chisel;
import team.chisel.block.BlockCarvableLayered;
import com.cricketcraft.ctmlib.Drawing;
import team.chisel.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererSnakeStone.java
+1 -3
View File
@@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import team.chisel.block.BlockSnakestone;
import com.cricketcraft.ctmlib.Drawing;
import team.chisel.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/RendererStairs.java
+1 -3
View File
@@ -7,9 +7,7 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import team.chisel.block.BlockCarvableStairs;
import com.cricketcraft.ctmlib.Drawing;
import team.chisel.ctmlib.Drawing;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java
+3 -5
View File
@@ -2,6 +2,9 @@ package team.chisel.client.render;
import org.lwjgl.opengl.GL11;
import team.chisel.ctmlib.Drawing;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import team.chisel.init.ChiselBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
@@ -10,11 +13,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.IItemRenderer;
import com.cricketcraft.ctmlib.Drawing;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/SubmapManagerBase.java
+1 -3
View File
@@ -1,13 +1,11 @@
package team.chisel.client.render;
import team.chisel.ctmlib.ISubmapManager;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import com.cricketcraft.ctmlib.ISubmapManager;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java
+2 -4
View File
@@ -1,14 +1,12 @@
package team.chisel.client.render;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java
+3 -2
View File
@@ -10,11 +10,12 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.apache.commons.lang3.tuple.Triple;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.rendering.TextureType;
import com.cricketcraft.chisel.api.rendering.TextureType.AbstractSubmapManager;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/SubmapManagerFakeController.java
+4 -3
View File
@@ -1,19 +1,20 @@
package team.chisel.client.render;
import team.chisel.Chisel;
import team.chisel.ctmlib.CTM;
import team.chisel.ctmlib.TextureSubmap;
import team.chisel.init.ChiselBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import com.cricketcraft.ctmlib.CTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import com.google.common.base.Optional;
import static team.chisel.ctmlib.Dir.*;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import static com.cricketcraft.ctmlib.Dir.*;
public class SubmapManagerFakeController extends SubmapManagerBase {
src/main/java/team/chisel/client/render/SubmapManagerSlab.java
+3 -5
View File
@@ -1,16 +1,14 @@
package team.chisel.client.render;
import team.chisel.ctmlib.ISubmapManager;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import com.cricketcraft.ctmlib.ISubmapManager;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java
+3 -3
View File
@@ -1,5 +1,8 @@
package team.chisel.client.render;
import team.chisel.ctmlib.ISubmapManager;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -10,9 +13,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.rendering.TextureType;
import com.cricketcraft.ctmlib.ISubmapManager;
import com.cricketcraft.ctmlib.RenderBlocksCTM;
import com.cricketcraft.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
src/main/java/team/chisel/config/Configurations.java
+1 -2
View File
@@ -9,8 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import team.chisel.Chisel;
import team.chisel.Features;
import com.cricketcraft.ctmlib.CTM;
import team.chisel.ctmlib.CTM;
public class Configurations {