mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-22 05:12:24 +00:00
The great format and clean up. IMPORTANT: Read below.
All devs and contributors should use the provided formatter settings. If your IDE does not support the format, the rules are simple, it is the default java formatting rules, with 200char line lengths and 1 extra line after class definitions.
This commit is contained in:
1 parent
906c730a3c
commit
4cfcc874dc
136 files changed
+10365
-11272
No files matched your search
@@ -1,14 +1,10 @@
|
||||
package com.cricketcraft.chisel.carving;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.Configurations;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleSlab;
|
||||
import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM;
|
||||
import com.cricketcraft.chisel.client.render.CTM;
|
||||
import com.cricketcraft.chisel.client.render.TextureSubmap;
|
||||
import com.cricketcraft.chisel.item.ItemCarvable;
|
||||
import com.cricketcraft.chisel.utils.GeneralClient;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockPane;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -18,422 +14,384 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.Configurations;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleSlab;
|
||||
import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM;
|
||||
import com.cricketcraft.chisel.client.render.CTM;
|
||||
import com.cricketcraft.chisel.client.render.TextureSubmap;
|
||||
import com.cricketcraft.chisel.item.ItemCarvable;
|
||||
import com.cricketcraft.chisel.utils.GeneralClient;
|
||||
|
||||
public class CarvableHelper
|
||||
{
|
||||
public static final ArrayList<Block> chiselBlocks = new ArrayList<Block>();
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public static final int NORMAL = 0;
|
||||
public static final int TOPSIDE = 1;
|
||||
public static final int TOPBOTSIDE = 2;
|
||||
public static final int CTM3 = 3;
|
||||
public static final int CTMV = 4;
|
||||
public static final int CTMH = 5;
|
||||
public static final int V9 = 6;
|
||||
public static final int V4 = 7;
|
||||
public static final int CTMX = 8;
|
||||
public class CarvableHelper {
|
||||
|
||||
public static final ArrayList<Block> chiselBlocks = new ArrayList<Block>();
|
||||
|
||||
public CarvableHelper()
|
||||
{
|
||||
}
|
||||
public static final int NORMAL = 0;
|
||||
public static final int TOPSIDE = 1;
|
||||
public static final int TOPBOTSIDE = 2;
|
||||
public static final int CTM3 = 3;
|
||||
public static final int CTMV = 4;
|
||||
public static final int CTMH = 5;
|
||||
public static final int V9 = 6;
|
||||
public static final int V4 = 7;
|
||||
public static final int CTMX = 8;
|
||||
|
||||
public ArrayList<CarvableVariation> variations = new ArrayList<CarvableVariation>();
|
||||
CarvableVariation[] map = new CarvableVariation[16];
|
||||
public boolean forbidChiseling = false;
|
||||
public String blockName;
|
||||
public CarvableHelper() {
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, Block bb)
|
||||
{
|
||||
addVariation(description, metadata, null, bb, 0);
|
||||
}
|
||||
public ArrayList<CarvableVariation> variations = new ArrayList<CarvableVariation>();
|
||||
CarvableVariation[] map = new CarvableVariation[16];
|
||||
public boolean forbidChiseling = false;
|
||||
public String blockName;
|
||||
|
||||
public void addVariation(String description, int metadata, Block bb, int blockMeta)
|
||||
{
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
public void addVariation(String description, int metadata, Block bb) {
|
||||
addVariation(description, metadata, null, bb, 0);
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material)
|
||||
{
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
public void addVariation(String description, int metadata, Block bb, int blockMeta) {
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, String texture)
|
||||
{
|
||||
addVariation(description, metadata, texture, null, 0);
|
||||
}
|
||||
public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material) {
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, String texture, Block block, int blockMeta)
|
||||
{
|
||||
if(variations.size() >= 16)
|
||||
return;
|
||||
public void addVariation(String description, int metadata, String texture) {
|
||||
addVariation(description, metadata, texture, null, 0);
|
||||
}
|
||||
|
||||
if(blockName == null && block != null)
|
||||
blockName = block.getLocalizedName();
|
||||
else if(blockName == null && description != null)
|
||||
blockName = description;
|
||||
public void addVariation(String description, int metadata, String texture, Block block, int blockMeta) {
|
||||
if (variations.size() >= 16)
|
||||
return;
|
||||
|
||||
CarvableVariation variation = new CarvableVariation();
|
||||
variation.description = description;
|
||||
variation.metadata = metadata;
|
||||
variation.blockName = blockName;
|
||||
if (blockName == null && block != null)
|
||||
blockName = block.getLocalizedName();
|
||||
else if (blockName == null && description != null)
|
||||
blockName = description;
|
||||
|
||||
if(texture != null)
|
||||
{
|
||||
variation.texture = texture;
|
||||
CarvableVariation variation = new CarvableVariation();
|
||||
variation.description = description;
|
||||
variation.metadata = metadata;
|
||||
variation.blockName = blockName;
|
||||
|
||||
String path = "/assets/" + Chisel.MOD_ID + "/textures/blocks/" + variation.texture;
|
||||
if (texture != null) {
|
||||
variation.texture = 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;
|
||||
boolean ctmv = Chisel.class.getResource(path + "-ctmv.png") != null;
|
||||
boolean ctmh = Chisel.class.getResource(path + "-ctmh.png") != null;
|
||||
boolean side = Chisel.class.getResource(path + "-side.png") != null;
|
||||
boolean top = Chisel.class.getResource(path + "-top.png") != null;
|
||||
boolean bot = Chisel.class.getResource(path + "-bottom.png") != null;
|
||||
boolean v9 = Chisel.class.getResource(path + "-v9.png") != null;
|
||||
boolean v4 = Chisel.class.getResource(path + "-v4.png") != null;
|
||||
boolean ctmx = Chisel.class.getResource(path + "-ctm.png") != null;
|
||||
String path = "/assets/" + Chisel.MOD_ID + "/textures/blocks/" + variation.texture;
|
||||
|
||||
if(ctm3)
|
||||
{
|
||||
variation.kind = 3;
|
||||
} else if(ctmh && top)
|
||||
{
|
||||
variation.kind = 5;
|
||||
} else if(ctmv && top)
|
||||
{
|
||||
variation.kind = CTMV;
|
||||
} else if(bot && top && side)
|
||||
{
|
||||
variation.kind = 2;
|
||||
} else if(top && side)
|
||||
{
|
||||
variation.kind = 1;
|
||||
} else if(v9)
|
||||
{
|
||||
variation.kind = V9;
|
||||
} else if(v4)
|
||||
{
|
||||
variation.kind = V4;
|
||||
} else if(any && ctmx && !Configurations.disableCTM)
|
||||
{
|
||||
variation.kind = CTMX;
|
||||
} else if(any)
|
||||
{
|
||||
variation.kind = 0;
|
||||
} else
|
||||
{
|
||||
throw new RuntimeException("No valid textures found for chisel block variation '" + description + "' (" + variation.texture + ")");
|
||||
}
|
||||
} else
|
||||
{
|
||||
variation.block = block;
|
||||
variation.kind = 2;
|
||||
variation.blockMeta = blockMeta;
|
||||
}
|
||||
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;
|
||||
boolean ctmv = Chisel.class.getResource(path + "-ctmv.png") != null;
|
||||
boolean ctmh = Chisel.class.getResource(path + "-ctmh.png") != null;
|
||||
boolean side = Chisel.class.getResource(path + "-side.png") != null;
|
||||
boolean top = Chisel.class.getResource(path + "-top.png") != null;
|
||||
boolean bot = Chisel.class.getResource(path + "-bottom.png") != null;
|
||||
boolean v9 = Chisel.class.getResource(path + "-v9.png") != null;
|
||||
boolean v4 = Chisel.class.getResource(path + "-v4.png") != null;
|
||||
boolean ctmx = Chisel.class.getResource(path + "-ctm.png") != null;
|
||||
|
||||
variations.add(variation);
|
||||
map[metadata] = variation;
|
||||
}
|
||||
if (ctm3) {
|
||||
variation.kind = 3;
|
||||
} else if (ctmh && top) {
|
||||
variation.kind = 5;
|
||||
} else if (ctmv && top) {
|
||||
variation.kind = CTMV;
|
||||
} else if (bot && top && side) {
|
||||
variation.kind = 2;
|
||||
} else if (top && side) {
|
||||
variation.kind = 1;
|
||||
} else if (v9) {
|
||||
variation.kind = V9;
|
||||
} else if (v4) {
|
||||
variation.kind = V4;
|
||||
} else if (any && ctmx && !Configurations.disableCTM) {
|
||||
variation.kind = CTMX;
|
||||
} else if (any) {
|
||||
variation.kind = 0;
|
||||
} else {
|
||||
throw new RuntimeException("No valid textures found for chisel block variation '" + description + "' (" + variation.texture + ")");
|
||||
}
|
||||
} else {
|
||||
variation.block = block;
|
||||
variation.kind = 2;
|
||||
variation.blockMeta = blockMeta;
|
||||
}
|
||||
|
||||
public CarvableVariation getVariation(int metadata)
|
||||
{
|
||||
if(metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
variations.add(variation);
|
||||
map[metadata] = variation;
|
||||
}
|
||||
|
||||
CarvableVariation variation = map[metadata];
|
||||
if(variation == null)
|
||||
return null;
|
||||
public CarvableVariation getVariation(int metadata) {
|
||||
if (metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
|
||||
return variation;
|
||||
}
|
||||
CarvableVariation variation = map[metadata];
|
||||
if (variation == null)
|
||||
return null;
|
||||
|
||||
public IIcon getIcon(int side, int metadata)
|
||||
{
|
||||
if(metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
return variation;
|
||||
}
|
||||
|
||||
CarvableVariation variation = map[metadata];
|
||||
if(variation == null)
|
||||
return GeneralClient.getMissingIcon();
|
||||
public IIcon getIcon(int side, int metadata) {
|
||||
if (metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
|
||||
switch(variation.kind)
|
||||
{
|
||||
case 0:
|
||||
return variation.icon;
|
||||
case 1:
|
||||
if(side == 0 || side == 1)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.icon;
|
||||
case 2:
|
||||
if(side == 1)
|
||||
return variation.iconTop;
|
||||
else if(side == 0)
|
||||
return variation.iconBot;
|
||||
else
|
||||
return variation.icon;
|
||||
case 3:
|
||||
return variation.ctm.seams[0].icons[0];
|
||||
case 4:
|
||||
if(side < 2)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case 5:
|
||||
if(side < 2)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case V9:
|
||||
return variation.variations9.icons[4];
|
||||
case V4:
|
||||
return variation.variations9.icons[0];
|
||||
case CTMX:
|
||||
return variation.icon;
|
||||
}
|
||||
CarvableVariation variation = map[metadata];
|
||||
if (variation == null)
|
||||
return GeneralClient.getMissingIcon();
|
||||
|
||||
return GeneralClient.getMissingIcon();
|
||||
}
|
||||
switch (variation.kind) {
|
||||
case 0:
|
||||
return variation.icon;
|
||||
case 1:
|
||||
if (side == 0 || side == 1)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.icon;
|
||||
case 2:
|
||||
if (side == 1)
|
||||
return variation.iconTop;
|
||||
else if (side == 0)
|
||||
return variation.iconBot;
|
||||
else
|
||||
return variation.icon;
|
||||
case 3:
|
||||
return variation.ctm.seams[0].icons[0];
|
||||
case 4:
|
||||
if (side < 2)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case 5:
|
||||
if (side < 2)
|
||||
return variation.iconTop;
|
||||
else
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case V9:
|
||||
return variation.variations9.icons[4];
|
||||
case V4:
|
||||
return variation.variations9.icons[0];
|
||||
case CTMX:
|
||||
return variation.icon;
|
||||
}
|
||||
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
return GeneralClient.getMissingIcon();
|
||||
}
|
||||
|
||||
if(metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
|
||||
CarvableVariation variation = map[metadata];
|
||||
if(variation == null)
|
||||
return GeneralClient.getMissingIcon();
|
||||
if (metadata < 0 || metadata > 15)
|
||||
metadata = 0;
|
||||
|
||||
switch(variation.kind)
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
return getIcon(side, metadata);
|
||||
case 3:
|
||||
int tex = CTM.getTexture(world, x, y, z, side);
|
||||
CarvableVariation variation = map[metadata];
|
||||
if (variation == null)
|
||||
return GeneralClient.getMissingIcon();
|
||||
|
||||
int row = tex / 16;
|
||||
int col = tex % 16;
|
||||
switch (variation.kind) {
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
return getIcon(side, metadata);
|
||||
case 3:
|
||||
int tex = CTM.getTexture(world, x, y, z, side);
|
||||
|
||||
return variation.ctm.seams[col / 4].icons[col % 4 + row * 4];
|
||||
case 4:
|
||||
{
|
||||
if(side < 2)
|
||||
return variation.iconTop;
|
||||
int row = tex / 16;
|
||||
int col = tex % 16;
|
||||
|
||||
Block block = world.getBlock(x, y, z);
|
||||
boolean topConnected = block.equals(CTM.getBlockOrFacade(world, x, y + 1, z, side)) && metadata == CTM.getBlockOrFacadeMetadata(world, x, y + 1, z, side);
|
||||
boolean botConnected = block.equals(CTM.getBlockOrFacade(world, x, y - 1, z, side)) && metadata == CTM.getBlockOrFacadeMetadata(world, x, y - 1, z, side);
|
||||
return variation.ctm.seams[col / 4].icons[col % 4 + row * 4];
|
||||
case 4: {
|
||||
if (side < 2)
|
||||
return variation.iconTop;
|
||||
|
||||
if(topConnected && botConnected) return variation.seamsCtmVert.icons[2];
|
||||
if(topConnected && !botConnected) return variation.seamsCtmVert.icons[3];
|
||||
if(!topConnected && botConnected) return variation.seamsCtmVert.icons[1];
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
}
|
||||
case 5:
|
||||
if(side < 2)
|
||||
return variation.iconTop;
|
||||
Block block = world.getBlock(x, y, z);
|
||||
boolean topConnected = block.equals(CTM.getBlockOrFacade(world, x, y + 1, z, side)) && metadata == CTM.getBlockOrFacadeMetadata(world, x, y + 1, z, side);
|
||||
boolean botConnected = block.equals(CTM.getBlockOrFacade(world, x, y - 1, z, side)) && metadata == CTM.getBlockOrFacadeMetadata(world, x, y - 1, z, side);
|
||||
|
||||
Block block = CTM.getBlockOrFacade(world, x, y, z, side);
|
||||
if (topConnected && botConnected)
|
||||
return variation.seamsCtmVert.icons[2];
|
||||
if (topConnected && !botConnected)
|
||||
return variation.seamsCtmVert.icons[3];
|
||||
if (!topConnected && botConnected)
|
||||
return variation.seamsCtmVert.icons[1];
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
}
|
||||
case 5:
|
||||
if (side < 2)
|
||||
return variation.iconTop;
|
||||
|
||||
boolean p;
|
||||
boolean n;
|
||||
boolean reverse = side == 2 || side == 4;
|
||||
Block block = CTM.getBlockOrFacade(world, x, y, z, side);
|
||||
|
||||
if(side < 4)
|
||||
{
|
||||
p = isSame(world, x - 1, y, z, block, metadata, side);
|
||||
n = isSame(world, x + 1, y, z, block, metadata, side);
|
||||
} else
|
||||
{
|
||||
p = isSame(world, x, y, z + 1, block, metadata, side);
|
||||
n = isSame(world, x, y, z - 1, block, metadata, side);
|
||||
}
|
||||
boolean p;
|
||||
boolean n;
|
||||
boolean reverse = side == 2 || side == 4;
|
||||
|
||||
if(p && n) return variation.seamsCtmVert.icons[1];
|
||||
else if(p) return variation.seamsCtmVert.icons[reverse ? 2 : 3];
|
||||
else if(n) return variation.seamsCtmVert.icons[reverse ? 3 : 2];
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case V9:
|
||||
case V4:
|
||||
int index = x + y * 606731 + z * 571163 + side * 555491;
|
||||
if(index < 0) index = -index;
|
||||
if (side < 4) {
|
||||
p = isSame(world, x - 1, y, z, block, metadata, side);
|
||||
n = isSame(world, x + 1, y, z, block, metadata, side);
|
||||
} else {
|
||||
p = isSame(world, x, y, z + 1, block, metadata, side);
|
||||
n = isSame(world, x, y, z - 1, block, metadata, side);
|
||||
}
|
||||
|
||||
return variation.variations9.icons[index % ((variation.kind == V9) ? 9 : 4)];
|
||||
case CTMX:
|
||||
return variation.icon;
|
||||
}
|
||||
if (p && n)
|
||||
return variation.seamsCtmVert.icons[1];
|
||||
else if (p)
|
||||
return variation.seamsCtmVert.icons[reverse ? 2 : 3];
|
||||
else if (n)
|
||||
return variation.seamsCtmVert.icons[reverse ? 3 : 2];
|
||||
return variation.seamsCtmVert.icons[0];
|
||||
case V9:
|
||||
case V4:
|
||||
int index = x + y * 606731 + z * 571163 + side * 555491;
|
||||
if (index < 0)
|
||||
index = -index;
|
||||
|
||||
return GeneralClient.getMissingIcon();
|
||||
}
|
||||
return variation.variations9.icons[index % ((variation.kind == V9) ? 9 : 4)];
|
||||
case CTMX:
|
||||
return variation.icon;
|
||||
}
|
||||
|
||||
public void register(Block block, String name)
|
||||
{
|
||||
register(block, name, ItemCarvable.class);
|
||||
}
|
||||
return GeneralClient.getMissingIcon();
|
||||
}
|
||||
|
||||
public void registerBlock(Block block, String name)
|
||||
{
|
||||
registerBlock(block, name, ItemCarvable.class);
|
||||
}
|
||||
public void register(Block block, String name) {
|
||||
register(block, name, ItemCarvable.class);
|
||||
}
|
||||
|
||||
void registerBlock(Block block, String name, Class<? extends ItemCarvable> cl)
|
||||
{
|
||||
block.setBlockName(name);
|
||||
GameRegistry.registerBlock(block, cl, name);
|
||||
chiselBlocks.add(block);
|
||||
}
|
||||
public void registerBlock(Block block, String name) {
|
||||
registerBlock(block, name, ItemCarvable.class);
|
||||
}
|
||||
|
||||
public void register(Block block, String name, Class<? extends ItemCarvable> cl)
|
||||
{
|
||||
registerBlock(block, name, cl);
|
||||
void registerBlock(Block block, String name, Class<? extends ItemCarvable> cl) {
|
||||
block.setBlockName(name);
|
||||
GameRegistry.registerBlock(block, cl, name);
|
||||
chiselBlocks.add(block);
|
||||
}
|
||||
|
||||
if(block instanceof BlockMarbleSlab)
|
||||
{
|
||||
BlockMarbleSlab slab = (BlockMarbleSlab) block;
|
||||
}
|
||||
public void register(Block block, String name, Class<? extends ItemCarvable> cl) {
|
||||
registerBlock(block, name, cl);
|
||||
|
||||
for(CarvableVariation variation : variations)
|
||||
{
|
||||
registerVariation(name, variation, block, variation.metadata);
|
||||
if (block instanceof BlockMarbleSlab) {
|
||||
BlockMarbleSlab slab = (BlockMarbleSlab) block;
|
||||
}
|
||||
|
||||
if(block instanceof BlockMarbleSlab && ((BlockMarbleSlab) block).isBottom)
|
||||
{
|
||||
BlockMarbleSlab slab = (BlockMarbleSlab) block;
|
||||
for (CarvableVariation variation : variations) {
|
||||
registerVariation(name, variation, block, variation.metadata);
|
||||
|
||||
if(!forbidChiseling)
|
||||
{
|
||||
Carving.chisel.addVariation(name + ".top", slab.top, variation.metadata, 0);
|
||||
Carving.chisel.setGroupClass(name + ".top", name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (block instanceof BlockMarbleSlab && ((BlockMarbleSlab) block).isBottom) {
|
||||
BlockMarbleSlab slab = (BlockMarbleSlab) block;
|
||||
|
||||
public void registerVariation(String name, CarvableVariation variation, Block block, int blockMeta)
|
||||
{
|
||||
if(forbidChiseling)
|
||||
return;
|
||||
if (!forbidChiseling) {
|
||||
Carving.chisel.addVariation(name + ".top", slab.top, variation.metadata, 0);
|
||||
Carving.chisel.setGroupClass(name + ".top", name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(variation.block == null)
|
||||
{
|
||||
Carving.chisel.addVariation(name, block, blockMeta, variation.metadata);
|
||||
} else
|
||||
{
|
||||
Carving.chisel.addVariation(name, variation.block, variation.blockMeta, variation.metadata);
|
||||
}
|
||||
}
|
||||
public void registerVariation(String name, CarvableVariation variation, Block block, int blockMeta) {
|
||||
if (forbidChiseling)
|
||||
return;
|
||||
|
||||
public void registerBlockIcons(String modName, Block block, IIconRegister register)
|
||||
{
|
||||
for(CarvableVariation variation : variations)
|
||||
{
|
||||
if(variation.block != null)
|
||||
{
|
||||
variation.block.registerBlockIcons(register);
|
||||
if (variation.block == null) {
|
||||
Carving.chisel.addVariation(name, block, blockMeta, variation.metadata);
|
||||
} else {
|
||||
Carving.chisel.addVariation(name, variation.block, variation.blockMeta, variation.metadata);
|
||||
}
|
||||
}
|
||||
|
||||
if(variation.block instanceof BlockPane)
|
||||
{
|
||||
variation.icon = variation.block.getBlockTextureFromSide(2);
|
||||
variation.iconTop = ((BlockPane) variation.block).getBlockTextureFromSide(0);
|
||||
variation.iconBot = ((BlockPane) variation.block).getBlockTextureFromSide(0);
|
||||
public void registerBlockIcons(String modName, Block block, IIconRegister register) {
|
||||
for (CarvableVariation variation : variations) {
|
||||
if (variation.block != null) {
|
||||
variation.block.registerBlockIcons(register);
|
||||
|
||||
} else
|
||||
{
|
||||
switch(variation.kind)
|
||||
{
|
||||
case 0:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
break;
|
||||
case 1:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
variation.iconTop = variation.block.getIcon(0, variation.blockMeta);
|
||||
break;
|
||||
case 2:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
variation.iconTop = variation.block.getIcon(1, variation.blockMeta);
|
||||
variation.iconBot = variation.block.getIcon(0, variation.blockMeta);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else
|
||||
{
|
||||
switch(variation.kind)
|
||||
{
|
||||
case 0:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture);
|
||||
break;
|
||||
case 1:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture + "-side");
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case 2:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture + "-side");
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
variation.iconBot = register.registerIcon(modName + ":" + variation.texture + "-bottom");
|
||||
break;
|
||||
case 3:
|
||||
CarvableVariationCTM ctm = new CarvableVariationCTM();
|
||||
ctm.seams[0] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm1"), 4, 4);
|
||||
ctm.seams[1] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm2"), 4, 4);
|
||||
ctm.seams[2] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm3"), 4, 4);
|
||||
variation.ctm = ctm;
|
||||
break;
|
||||
case 4:
|
||||
variation.seamsCtmVert = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctmv"), 2, 2);
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case 5:
|
||||
variation.seamsCtmVert = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctmh"), 2, 2);
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case V9:
|
||||
variation.variations9 = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-v9"), 3, 3);
|
||||
break;
|
||||
case V4:
|
||||
variation.variations9 = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-v4"), 2, 2);
|
||||
break;
|
||||
case CTMX:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture);
|
||||
variation.submap = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm"), 4, 4);
|
||||
variation.submapSmall = new TextureSubmap(variation.icon, 2, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (variation.block instanceof BlockPane) {
|
||||
variation.icon = variation.block.getBlockTextureFromSide(2);
|
||||
variation.iconTop = ((BlockPane) variation.block).getBlockTextureFromSide(0);
|
||||
variation.iconBot = ((BlockPane) variation.block).getBlockTextureFromSide(0);
|
||||
|
||||
public void registerSubBlocks(Block block, CreativeTabs tabs, List<ItemStack> list)
|
||||
{
|
||||
for(CarvableVariation variation : variations)
|
||||
{
|
||||
list.add(new ItemStack(block, 1, variation.metadata));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
switch (variation.kind) {
|
||||
case 0:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
break;
|
||||
case 1:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
variation.iconTop = variation.block.getIcon(0, variation.blockMeta);
|
||||
break;
|
||||
case 2:
|
||||
variation.icon = variation.block.getIcon(2, variation.blockMeta);
|
||||
variation.iconTop = variation.block.getIcon(1, variation.blockMeta);
|
||||
variation.iconBot = variation.block.getIcon(0, variation.blockMeta);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
switch (variation.kind) {
|
||||
case 0:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture);
|
||||
break;
|
||||
case 1:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture + "-side");
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case 2:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture + "-side");
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
variation.iconBot = register.registerIcon(modName + ":" + variation.texture + "-bottom");
|
||||
break;
|
||||
case 3:
|
||||
CarvableVariationCTM ctm = new CarvableVariationCTM();
|
||||
ctm.seams[0] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm1"), 4, 4);
|
||||
ctm.seams[1] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm2"), 4, 4);
|
||||
ctm.seams[2] = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm3"), 4, 4);
|
||||
variation.ctm = ctm;
|
||||
break;
|
||||
case 4:
|
||||
variation.seamsCtmVert = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctmv"), 2, 2);
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case 5:
|
||||
variation.seamsCtmVert = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctmh"), 2, 2);
|
||||
variation.iconTop = register.registerIcon(modName + ":" + variation.texture + "-top");
|
||||
break;
|
||||
case V9:
|
||||
variation.variations9 = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-v9"), 3, 3);
|
||||
break;
|
||||
case V4:
|
||||
variation.variations9 = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-v4"), 2, 2);
|
||||
break;
|
||||
case CTMX:
|
||||
variation.icon = register.registerIcon(modName + ":" + variation.texture);
|
||||
variation.submap = new TextureSubmap(register.registerIcon(modName + ":" + variation.texture + "-ctm"), 4, 4);
|
||||
variation.submapSmall = new TextureSubmap(variation.icon, 2, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isSame(IBlockAccess world, int x, int y, int z, Block block, int meta, int side)
|
||||
{
|
||||
return CTM.getBlockOrFacade(world, x, y, z, side).equals(block) && CTM.getBlockOrFacadeMetadata(world, x, y, z, side) == meta;
|
||||
}
|
||||
public void registerSubBlocks(Block block, CreativeTabs tabs, List<ItemStack> list) {
|
||||
for (CarvableVariation variation : variations) {
|
||||
list.add(new ItemStack(block, 1, variation.metadata));
|
||||
}
|
||||
}
|
||||
|
||||
public void setChiselBlockName(String name)
|
||||
{
|
||||
blockName = name;
|
||||
}
|
||||
private boolean isSame(IBlockAccess world, int x, int y, int z, Block block, int meta, int side) {
|
||||
return CTM.getBlockOrFacade(world, x, y, z, side).equals(block) && CTM.getBlockOrFacadeMetadata(world, x, y, z, side) == meta;
|
||||
}
|
||||
|
||||
public static Set<Block> getChiselBlockSet()
|
||||
{
|
||||
HashSet<Block> tools = new HashSet<Block>();
|
||||
tools.addAll(CarvableHelper.chiselBlocks);
|
||||
return tools;
|
||||
}
|
||||
public void setChiselBlockName(String name) {
|
||||
blockName = name;
|
||||
}
|
||||
|
||||
public static Set<Block> getChiselBlockSet() {
|
||||
HashSet<Block> tools = new HashSet<Block>();
|
||||
tools.addAll(CarvableHelper.chiselBlocks);
|
||||
return tools;
|
||||
}
|
||||
}
|
||||
@@ -5,31 +5,31 @@ import net.minecraft.util.IIcon;
|
||||
|
||||
import com.cricketcraft.chisel.client.render.TextureSubmap;
|
||||
|
||||
public class CarvableVariation
|
||||
{
|
||||
public String blockName;
|
||||
public String description;
|
||||
public int metadata;
|
||||
public int kind;
|
||||
public class CarvableVariation {
|
||||
|
||||
public Block block;
|
||||
public int blockMeta;
|
||||
public String blockName;
|
||||
public String description;
|
||||
public int metadata;
|
||||
public int kind;
|
||||
|
||||
public String texture;
|
||||
public Block block;
|
||||
public int blockMeta;
|
||||
|
||||
public IIcon icon;
|
||||
public IIcon iconTop;
|
||||
public IIcon iconBot;
|
||||
public String texture;
|
||||
|
||||
public CarvableVariationCTM ctm;
|
||||
public TextureSubmap seamsCtmVert;
|
||||
public TextureSubmap variations9;
|
||||
public IIcon icon;
|
||||
public IIcon iconTop;
|
||||
public IIcon iconBot;
|
||||
|
||||
public TextureSubmap submap;
|
||||
public TextureSubmap submapSmall;
|
||||
public CarvableVariationCTM ctm;
|
||||
public TextureSubmap seamsCtmVert;
|
||||
public TextureSubmap variations9;
|
||||
|
||||
static class CarvableVariationCTM
|
||||
{
|
||||
TextureSubmap seams[] = new TextureSubmap[3];
|
||||
}
|
||||
public TextureSubmap submap;
|
||||
public TextureSubmap submapSmall;
|
||||
|
||||
static class CarvableVariationCTM {
|
||||
|
||||
TextureSubmap seams[] = new TextureSubmap[3];
|
||||
}
|
||||
}
|
||||
@@ -12,187 +12,171 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
|
||||
public class Carving
|
||||
{
|
||||
HashMap<String, CarvingGroup> carvingGroupsByName = new HashMap<String, CarvingGroup>();
|
||||
HashMap<String, CarvingGroup> carvingGroupsByOre = new HashMap<String, CarvingGroup>();
|
||||
HashMap<String, CarvingGroup> carvingGroupsByVariation = new HashMap<String, CarvingGroup>();
|
||||
public class Carving {
|
||||
|
||||
public static Carving chisel = new Carving();
|
||||
public static Carving needle = new Carving();
|
||||
HashMap<String, CarvingGroup> carvingGroupsByName = new HashMap<String, CarvingGroup>();
|
||||
HashMap<String, CarvingGroup> carvingGroupsByOre = new HashMap<String, CarvingGroup>();
|
||||
HashMap<String, CarvingGroup> carvingGroupsByVariation = new HashMap<String, CarvingGroup>();
|
||||
|
||||
String key(Item item, int metadata)
|
||||
{
|
||||
return Item.itemRegistry.getNameForObject(item) + "|" + metadata;
|
||||
}
|
||||
public static Carving chisel = new Carving();
|
||||
public static Carving needle = new Carving();
|
||||
|
||||
String key(Block block, int metadata)
|
||||
{
|
||||
return Block.blockRegistry.getNameForObject(block) + "|" + metadata;
|
||||
}
|
||||
String key(Item item, int metadata) {
|
||||
return Item.itemRegistry.getNameForObject(item) + "|" + metadata;
|
||||
}
|
||||
|
||||
public boolean isVariationOfSameClass(Block target, int metadata1, Block block2, int metadata2)
|
||||
{
|
||||
CarvingGroup group1 = carvingGroupsByVariation.get(key(target, metadata1));
|
||||
if(group1 == null) return false;
|
||||
String key(Block block, int metadata) {
|
||||
return Block.blockRegistry.getNameForObject(block) + "|" + metadata;
|
||||
}
|
||||
|
||||
CarvingGroup group2 = carvingGroupsByVariation.get(key(block2, metadata2));
|
||||
if(group2 == null) return false;
|
||||
public boolean isVariationOfSameClass(Block target, int metadata1, Block block2, int metadata2) {
|
||||
CarvingGroup group1 = carvingGroupsByVariation.get(key(target, metadata1));
|
||||
if (group1 == null)
|
||||
return false;
|
||||
|
||||
return group1 == group2 || group1.className.equals(group2.className) && !group1.className.isEmpty();
|
||||
CarvingGroup group2 = carvingGroupsByVariation.get(key(block2, metadata2));
|
||||
if (group2 == null)
|
||||
return false;
|
||||
|
||||
}
|
||||
return group1 == group2 || group1.className.equals(group2.className) && !group1.className.isEmpty();
|
||||
|
||||
public CarvingVariation[] getVariations(Block block, int metadata)
|
||||
{
|
||||
CarvingGroup group = getGroup(block, metadata);
|
||||
if(group == null) return null;
|
||||
}
|
||||
|
||||
CarvingVariation[] res = group.variations.toArray(new CarvingVariation[group.variations.size()]);
|
||||
return res;
|
||||
}
|
||||
public CarvingVariation[] getVariations(Block block, int metadata) {
|
||||
CarvingGroup group = getGroup(block, metadata);
|
||||
if (group == null)
|
||||
return null;
|
||||
|
||||
public String getOre(Block block, int metadata)
|
||||
{
|
||||
CarvingGroup group = getGroup(block, metadata);
|
||||
if(group == null)
|
||||
return null;
|
||||
CarvingVariation[] res = group.variations.toArray(new CarvingVariation[group.variations.size()]);
|
||||
return res;
|
||||
}
|
||||
|
||||
return group.oreName;
|
||||
}
|
||||
public String getOre(Block block, int metadata) {
|
||||
CarvingGroup group = getGroup(block, metadata);
|
||||
if (group == null)
|
||||
return null;
|
||||
|
||||
public ArrayList<ItemStack> getItems(ItemStack chiseledItem)
|
||||
{
|
||||
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
|
||||
return group.oreName;
|
||||
}
|
||||
|
||||
int damage = chiseledItem.getItemDamage();
|
||||
public ArrayList<ItemStack> getItems(ItemStack chiseledItem) {
|
||||
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
|
||||
|
||||
CarvingGroup group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), damage);
|
||||
if(group == null)
|
||||
return items;
|
||||
int damage = chiseledItem.getItemDamage();
|
||||
|
||||
HashMap<String, Integer> mapping = new HashMap<String, Integer>();
|
||||
CarvingGroup group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), damage);
|
||||
if (group == null)
|
||||
return items;
|
||||
|
||||
if(group.variations != null)
|
||||
{
|
||||
for(CarvingVariation v : group.variations)
|
||||
{
|
||||
HashMap<String, Integer> mapping = new HashMap<String, Integer>();
|
||||
|
||||
String key = Block.getIdFromBlock(v.block) + "|" + v.damage;
|
||||
if(mapping.containsKey(key)) continue;
|
||||
mapping.put(key, 1);
|
||||
if (group.variations != null) {
|
||||
for (CarvingVariation v : group.variations) {
|
||||
|
||||
items.add(new ItemStack(v.block, 1, v.damage));
|
||||
}
|
||||
}
|
||||
String key = Block.getIdFromBlock(v.block) + "|" + v.damage;
|
||||
if (mapping.containsKey(key))
|
||||
continue;
|
||||
mapping.put(key, 1);
|
||||
|
||||
ArrayList<ItemStack> ores;
|
||||
if(group.oreName != null && ((ores = OreDictionary.getOres(group.oreName)) != null))
|
||||
{
|
||||
for(ItemStack stack : ores)
|
||||
{
|
||||
items.add(new ItemStack(v.block, 1, v.damage));
|
||||
}
|
||||
}
|
||||
|
||||
String key = Item.getIdFromItem(stack.getItem()) + "|" + stack.getItemDamage();
|
||||
if(mapping.containsKey(key)) continue;
|
||||
mapping.put(key, 2);
|
||||
ArrayList<ItemStack> ores;
|
||||
if (group.oreName != null && ((ores = OreDictionary.getOres(group.oreName)) != null)) {
|
||||
for (ItemStack stack : ores) {
|
||||
|
||||
items.add(stack);
|
||||
}
|
||||
}
|
||||
String key = Item.getIdFromItem(stack.getItem()) + "|" + stack.getItemDamage();
|
||||
if (mapping.containsKey(key))
|
||||
continue;
|
||||
mapping.put(key, 2);
|
||||
|
||||
return items;
|
||||
}
|
||||
items.add(stack);
|
||||
}
|
||||
}
|
||||
|
||||
public CarvingGroup getGroup(Block block, int metadata)
|
||||
{
|
||||
if(block.equals(Blocks.stone))
|
||||
block = Blocks.stonebrick;
|
||||
return items;
|
||||
}
|
||||
|
||||
// Check name first
|
||||
CarvingGroup res;
|
||||
int i = OreDictionary.getOreID(block.getUnlocalizedName());
|
||||
if(i < 1)
|
||||
return null;
|
||||
|
||||
//get All dictionary names for that block via Ids
|
||||
//the first one matching with a group is chosen
|
||||
int[] oreDictIds = OreDictionary.getOreIDs(new ItemStack(block, 1, metadata));
|
||||
for (int oreId : oreDictIds) {
|
||||
String oreDictName = OreDictionary.getOreName(oreId);
|
||||
if(carvingGroupsByOre.containsKey(oreDictName))
|
||||
return carvingGroupsByOre.get(oreDictName);
|
||||
}
|
||||
|
||||
if((res = carvingGroupsByVariation.get(key(block, metadata))) != null)
|
||||
return res;
|
||||
public CarvingGroup getGroup(Block block, int metadata) {
|
||||
if (block.equals(Blocks.stone))
|
||||
block = Blocks.stonebrick;
|
||||
|
||||
return null;
|
||||
}
|
||||
// Check name first
|
||||
CarvingGroup res;
|
||||
int i = OreDictionary.getOreID(block.getUnlocalizedName());
|
||||
if (i < 1)
|
||||
return null;
|
||||
|
||||
CarvingGroup getGroup(String name)
|
||||
{
|
||||
CarvingGroup group = carvingGroupsByName.get(name);
|
||||
if(group == null)
|
||||
{
|
||||
group = new CarvingGroup(name);
|
||||
group.className = name;
|
||||
carvingGroupsByName.put(name, group);
|
||||
}
|
||||
// get All dictionary names for that block via Ids
|
||||
// the first one matching with a group is chosen
|
||||
int[] oreDictIds = OreDictionary.getOreIDs(new ItemStack(block, 1, metadata));
|
||||
for (int oreId : oreDictIds) {
|
||||
String oreDictName = OreDictionary.getOreName(oreId);
|
||||
if (carvingGroupsByOre.containsKey(oreDictName))
|
||||
return carvingGroupsByOre.get(oreDictName);
|
||||
}
|
||||
|
||||
return group;
|
||||
}
|
||||
if ((res = carvingGroupsByVariation.get(key(block, metadata))) != null)
|
||||
return res;
|
||||
|
||||
public CarvingVariation addVariation(String name, Block block, int metadata, int order)
|
||||
{
|
||||
CarvingGroup group = getGroup(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
CarvingGroup blockGroup = carvingGroupsByVariation.get(key(block, metadata));
|
||||
if(blockGroup != null || blockGroup == group)
|
||||
return null;
|
||||
CarvingGroup getGroup(String name) {
|
||||
CarvingGroup group = carvingGroupsByName.get(name);
|
||||
if (group == null) {
|
||||
group = new CarvingGroup(name);
|
||||
group.className = name;
|
||||
carvingGroupsByName.put(name, group);
|
||||
}
|
||||
|
||||
CarvingVariation variation = new CarvingVariation(block, metadata, order);
|
||||
group.variations.add(variation);
|
||||
Collections.sort(group.variations);
|
||||
carvingGroupsByVariation.put(key(block, metadata), group);
|
||||
return group;
|
||||
}
|
||||
|
||||
return variation;
|
||||
}
|
||||
public CarvingVariation addVariation(String name, Block block, int metadata, int order) {
|
||||
CarvingGroup group = getGroup(name);
|
||||
|
||||
CarvingGroup blockGroup = carvingGroupsByVariation.get(key(block, metadata));
|
||||
if (blockGroup != null || blockGroup == group)
|
||||
return null;
|
||||
|
||||
public void registerOre(String name, String oreName)
|
||||
{
|
||||
CarvingGroup group = getGroup(name);
|
||||
CarvingVariation variation = new CarvingVariation(block, metadata, order);
|
||||
group.variations.add(variation);
|
||||
Collections.sort(group.variations);
|
||||
carvingGroupsByVariation.put(key(block, metadata), group);
|
||||
|
||||
carvingGroupsByOre.put(oreName, group);
|
||||
return variation;
|
||||
}
|
||||
|
||||
group.oreName = oreName;
|
||||
}
|
||||
public void registerOre(String name, String oreName) {
|
||||
CarvingGroup group = getGroup(name);
|
||||
|
||||
public void setGroupClass(String name, String className)
|
||||
{
|
||||
CarvingGroup group = getGroup(name);
|
||||
carvingGroupsByOre.put(oreName, group);
|
||||
|
||||
group.className = className;
|
||||
}
|
||||
group.oreName = oreName;
|
||||
}
|
||||
|
||||
public void setVariationSound(String name, String sound)
|
||||
{
|
||||
CarvingGroup group = getGroup(name);
|
||||
group.sound = sound;
|
||||
}
|
||||
public void setGroupClass(String name, String className) {
|
||||
CarvingGroup group = getGroup(name);
|
||||
|
||||
public String getVariationSound(Block block, int metadata)
|
||||
{
|
||||
return getVariationSound(Item.getItemFromBlock(block), metadata);
|
||||
}
|
||||
group.className = className;
|
||||
}
|
||||
|
||||
public String getVariationSound(Item item, int metadata)
|
||||
{
|
||||
CarvingGroup blockGroup = carvingGroupsByVariation.get(key(item, metadata));
|
||||
if(blockGroup == null || blockGroup.sound == null)
|
||||
return Chisel.MOD_ID+":chisel.fallback";
|
||||
public void setVariationSound(String name, String sound) {
|
||||
CarvingGroup group = getGroup(name);
|
||||
group.sound = sound;
|
||||
}
|
||||
|
||||
return blockGroup.sound;
|
||||
}
|
||||
public String getVariationSound(Block block, int metadata) {
|
||||
return getVariationSound(Item.getItemFromBlock(block), metadata);
|
||||
}
|
||||
|
||||
public String getVariationSound(Item item, int metadata) {
|
||||
CarvingGroup blockGroup = carvingGroupsByVariation.get(key(item, metadata));
|
||||
if (blockGroup == null || blockGroup.sound == null)
|
||||
return Chisel.MOD_ID + ":chisel.fallback";
|
||||
|
||||
return blockGroup.sound;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,17 +2,16 @@ package com.cricketcraft.chisel.carving;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class CarvingGroup
|
||||
{
|
||||
public CarvingGroup(String n)
|
||||
{
|
||||
name = n;
|
||||
}
|
||||
public class CarvingGroup {
|
||||
|
||||
String name;
|
||||
String className;
|
||||
String sound;
|
||||
String oreName;
|
||||
public CarvingGroup(String n) {
|
||||
name = n;
|
||||
}
|
||||
|
||||
ArrayList<CarvingVariation> variations = new ArrayList<CarvingVariation>();
|
||||
String name;
|
||||
String className;
|
||||
String sound;
|
||||
String oreName;
|
||||
|
||||
ArrayList<CarvingVariation> variations = new ArrayList<CarvingVariation>();
|
||||
}
|
||||
@@ -2,24 +2,22 @@ package com.cricketcraft.chisel.carving;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
public class CarvingVariation implements Comparable
|
||||
{
|
||||
public CarvingVariation(Block block, int metadata, int ord)
|
||||
{
|
||||
this.order = ord;
|
||||
this.block = block;
|
||||
this.meta = metadata;
|
||||
this.damage = metadata;
|
||||
}
|
||||
public class CarvingVariation implements Comparable {
|
||||
|
||||
@Override
|
||||
public int compareTo(Object a)
|
||||
{
|
||||
return order - ((CarvingVariation) a).order;
|
||||
}
|
||||
public CarvingVariation(Block block, int metadata, int ord) {
|
||||
this.order = ord;
|
||||
this.block = block;
|
||||
this.meta = metadata;
|
||||
this.damage = metadata;
|
||||
}
|
||||
|
||||
public int order;
|
||||
public Block block;
|
||||
public int meta;
|
||||
public int damage;
|
||||
@Override
|
||||
public int compareTo(Object a) {
|
||||
return order - ((CarvingVariation) a).order;
|
||||
}
|
||||
|
||||
public int order;
|
||||
public Block block;
|
||||
public int meta;
|
||||
public int damage;
|
||||
}
|
||||
Reference in new issue
Block a user