mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-16 10:45:02 +00:00
Fix left-click chiseling.
Remove chisel harvest levels. Both chisels in 1 ID
This commit is contained in:
1 parent
7a869bd522
commit
364eecdb12
12 files changed
+231
-153
No files matched your search
@@ -132,6 +132,7 @@ public class Chisel
|
||||
Configurations.config.load();
|
||||
Configurations.refreshConfig();
|
||||
|
||||
PacketHandler.init();
|
||||
ModTabs.load();
|
||||
ModBlocks.load();
|
||||
ModItems.load();
|
||||
@@ -213,52 +214,4 @@ public class Chisel
|
||||
Configurations.refreshConfig();
|
||||
}
|
||||
}
|
||||
@SubscribeEvent
|
||||
public void onLeftClickBlock(PlayerInteractEvent event)
|
||||
{
|
||||
ItemStack held = event.entityPlayer.getCurrentEquippedItem();
|
||||
int slot = event.entityPlayer.inventory.currentItem;
|
||||
Carving carving = new Carving();
|
||||
|
||||
if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK && held != null && held.getItem().equals(Configurations.featureEnabled("diamondChisel") ? ModItems.diamondChisel : ModItems.chisel))
|
||||
{
|
||||
int x = event.x, y = event.y, z = event.z;
|
||||
Block block = event.world.getBlock(x, y, z);
|
||||
int metadata = event.world.getBlockMetadata(x, y, z);
|
||||
CarvingVariation[] variations = carving.getVariations(block, metadata);
|
||||
|
||||
if (variations != null)
|
||||
{
|
||||
ItemStack target = new ItemStack(block, metadata);
|
||||
|
||||
if (target != null)
|
||||
{
|
||||
for (CarvingVariation v : variations)
|
||||
{
|
||||
if (v.block == Block.getBlockFromItem(target.getItem()) && v.meta == target.getItemDamage())
|
||||
{
|
||||
event.world.setBlock(x, y, z, v.block);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < variations.length; i++)
|
||||
{
|
||||
CarvingVariation v = variations[i];
|
||||
if (v.block == block && v.meta == metadata)
|
||||
{
|
||||
variations = ArrayUtils.remove(variations, i--);
|
||||
}
|
||||
}
|
||||
|
||||
int index = event.world.rand.nextInt(variations.length);
|
||||
CarvingVariation newVar = variations[index];
|
||||
event.world.setBlock(x, y, z, newVar.block);
|
||||
GeneralClient.playChiselSound(event.world, x, y, z, MOD_ID + ":chisel.fallback");
|
||||
event.entityPlayer.inventory.currentItem = slot;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user