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

Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev

Browse Source
This commit is contained in:
tterrag1098 committed 2015-07-01 23:42:08 -04:00
2 parents 77ee13d15c 5dc28005e9
commit 2bdb6ef9c0
45 files changed
+50 -333
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/Features.java
+14 -2
View File
@@ -95,6 +95,17 @@ public enum Features {
aluminum.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted", 25);
aluminum.carverHelper.registerAll(aluminum, "aluminumblock");
Carving.chisel.registerOre("aluminumblock", "blockAluminum");
CarvableStairsMaker aluminumStairs = new CarvableStairsMaker(aluminum);
aluminumStairs.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution");
aluminumStairs.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate");
aluminumStairs.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal");
aluminumStairs.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/aluminum/adv");
aluminumStairs.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/aluminum/egregious");
aluminumStairs.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted");
aluminumStairs.create("aluminum_stairs", ChiselBlocks.aluminumStairs);
Carving.chisel.registerOre("aluminum_stairs", "aluminum_stairs");
}
},
@@ -805,9 +816,10 @@ public enum Features {
BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F);
futura.carverHelper.addVariation("tile.futura.0.desc", 0, "futura/WIP/screenMetallicWIP");
futura.carverHelper.addVariation("tile.futura.1.desc", 1, "futura/WIP/screenCyanWIP");
futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controllerWIP-Overlay", new SubmapManagerFakeController(2));
futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controller", new SubmapManagerFakeController(2, "futura/WIP/controller"));
futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP");
futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controllerWIP-Overlay", new SubmapManagerFakeController(4));
futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controller", new SubmapManagerFakeController(4, "futura/WIP/controllerPurple"));
futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/controller", new SubmapManagerFakeController(5, "futura/WIP/uberWavy"));
futura.carverHelper.registerAll(futura, "futura");
BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F);
src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.cricketcraft.chisel.block;
import com.cricketcraft.chisel.init.ChiselTabs;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -30,7 +31,7 @@ public class CarvableStairsMaker {
String n = name + "." + i;
blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper);
blocks[i].setBlockName("chisel." + n);
blocks[i].setBlockName("chisel." + n).setCreativeTab(ChiselTabs.tabStairChiselBlocks);
GameRegistry.registerBlock(blocks[i], ItemCarvable.class, n);
for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.infoList.size(); meta++) {
src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java
+23 -7
View File
@@ -1,5 +1,6 @@
package com.cricketcraft.chisel.client.render;
import com.cricketcraft.chisel.Chisel;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
@@ -19,6 +20,13 @@ public class SubmapManagerFakeController extends SubmapManagerBase {
private TextureSubmap map;
private CTM ctm = CTM.getInstance();
private int meta;
private String texturePath;
public SubmapManagerFakeController(int meta, String texture) {
ctm.disableObscuredFaceCheck = true;
this.meta = meta;
texturePath = texture;
}
public SubmapManagerFakeController(int meta) {
ctm.disableObscuredFaceCheck = true;
@@ -31,9 +39,11 @@ public class SubmapManagerFakeController extends SubmapManagerBase {
}
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
{
ctm.buildConnectionMap(world, x, y, z, side, ChiselBlocks.futura, meta);
if (ctm.connectedAnd(TOP, BOTTOM, LEFT, RIGHT)) {
if (ctm.connectedAnd(TOP, TOP_RIGHT, RIGHT, BOTTOM_RIGHT, BOTTOM, BOTTOM_LEFT, LEFT, TOP_LEFT)) {
return map.getSubIcon(1, 1);
} else if (ctm.connectedAnd(TOP, BOTTOM)) {
return map.getSubIcon(0, 1);
@@ -47,10 +57,16 @@ public class SubmapManagerFakeController extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(String modName, Block block, IIconRegister register) {
if(meta == 2){
map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2);
} else {
map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controllerPurple"), 2, 2);
}
if (texturePath != null)
{
map = new TextureSubmap(register.registerIcon(modName + ":" + texturePath), 2, 2);
}
else
{
Chisel.logger.info("SubmapManagerFakeController was called on block " + block.getUnlocalizedName()
+ " without declaring texture, using a default texture instead.");
map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2);
}
}
}
src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java
+1
View File
@@ -92,6 +92,7 @@ public final class ChiselBlocks {
public static final BlockCarvable copperblock = null;
public static final BlockCarvable bronzeblock = null;
public static final BlockCarvable aluminumblock = null;
public static BlockCarvableStairs[] aluminumStairs = new BlockCarvableStairs[8];
public static final BlockCarvable leadblock = null;
public static final BlockCarvable silverblock = null;
public static final BlockCarvable steelblock = null;
src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java
+5
View File
@@ -66,6 +66,7 @@ public class ChiselTabs {
public static final CustomCreativeTab tabMetalChiselBlocks = new CustomCreativeTab("tabMetalChiselBlocks", true);
public static final CustomCreativeTab tabOtherChiselBlocks = new CustomCreativeTab("tabOtherChiselBlocks", true);
public static final CustomCreativeTab tabModdedChiselBlocks = new CustomCreativeTab("tabModdedChiselBlocks", true);
public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true);
// this serves mostly just to load the static initializers
public static void preInit() {
@@ -94,6 +95,10 @@ public class ChiselTabs {
tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0]));
else
tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.lit_pumpkin));
if (Features.ICE_STAIRS.enabled())
tabStairChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.iceStairs[0]));
else
tabStairChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.nether_brick_stairs));
if (atLeastOneModIsLoaded) {
if (Features.ARCANE.enabled()) {