mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
Fixed landmine behaviors
- TODO: Fix sync issues in landmines
This commit is contained in:
1 parent
20eafc2cd6
commit
ac5dcee2db
5 files changed
+143
-90
No files matched your search
@@ -0,0 +1,60 @@
|
||||
package tconstruct.util.landmine;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.*;
|
||||
|
||||
public class LandmineStack {
|
||||
|
||||
public final boolean isBlock;
|
||||
public final Block block;
|
||||
public final Item item;
|
||||
public final int meta;
|
||||
|
||||
public LandmineStack(Block block){
|
||||
this(block, -314159265);
|
||||
}
|
||||
|
||||
public LandmineStack(Item item){
|
||||
this(item, -314159265);
|
||||
}
|
||||
|
||||
public LandmineStack(Block block, int meta){
|
||||
isBlock = true;
|
||||
this.block = block;
|
||||
this.item = null;
|
||||
this.meta = meta;
|
||||
}
|
||||
|
||||
public LandmineStack(Item item, int meta){
|
||||
isBlock = false;
|
||||
this.block = null;
|
||||
this.item = item;
|
||||
this.meta = meta;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o){
|
||||
//Comparing landmine stacks
|
||||
if(o instanceof LandmineStack){
|
||||
LandmineStack stack = (LandmineStack)o;
|
||||
if(isBlock){
|
||||
return block == stack.block && (meta == stack.meta || meta == -314159265);
|
||||
}else{
|
||||
return item == stack.item && (meta == stack.meta || meta == -314159265);
|
||||
}
|
||||
//Comparing landmine stacks with item stacks
|
||||
}else if(o instanceof ItemStack){
|
||||
ItemStack stack = (ItemStack) o;
|
||||
if(isBlock && stack.getItem() instanceof ItemBlock){
|
||||
return block == ((ItemBlock)stack.getItem()).field_150939_a && (meta == stack.getItemDamage() || meta == -314159265);
|
||||
}else if(!isBlock){
|
||||
return item == stack.getItem() && (meta == stack.getItemDamage() || meta == -314159265);
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,21 +1,16 @@
|
||||
package tconstruct.util.landmine.behavior;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import tconstruct.util.landmine.LandmineStack;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.ITileEntityProvider;
|
||||
import java.util.*;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.init.*;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import tconstruct.util.landmine.Helper;
|
||||
import tconstruct.util.landmine.*;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -25,8 +20,8 @@ import tconstruct.util.landmine.Helper;
|
||||
public abstract class Behavior
|
||||
{
|
||||
|
||||
public static HashMap<ItemStack, Behavior> behaviorsListItems = new HashMap<ItemStack, Behavior>();
|
||||
public static HashMap<ItemStack, Behavior> behaviorsListBlocks = new HashMap<ItemStack, Behavior>();
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListItems = new HashMap<LandmineStack, Behavior>();
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListBlocks = new HashMap<LandmineStack, Behavior>();
|
||||
protected static Behavior defaultBehavior;
|
||||
|
||||
public static Behavior dummy = new BehaviorDummy();
|
||||
@@ -42,21 +37,22 @@ public abstract class Behavior
|
||||
|
||||
public static void registerBuiltInBehaviors ()
|
||||
{
|
||||
System.out.println("Test");
|
||||
defaultBehavior = new BehaviorDefault();
|
||||
|
||||
addBehavior(new ItemStack(Items.stick), dummy);
|
||||
addBehavior(new ItemStack(Items.redstone), utilityMode);
|
||||
addBehavior(new ItemStack(Blocks.torch), blockThrow);
|
||||
addBehavior(new ItemStack(Items.gunpowder), explosive);
|
||||
addBehavior(new ItemStack(Blocks.tnt), explosive);
|
||||
addBehavior(new ItemStack(Items.fireworks), firework);
|
||||
addBehavior(new ItemStack(Items.potionitem), potion);
|
||||
addBehavior(new ItemStack(Items.fire_charge), fireball);
|
||||
addBehavior(new ItemStack(Items.spawn_egg), spawn);
|
||||
addBehavior(new ItemStack(Items.arrow), shoot);
|
||||
addBehavior(new ItemStack(Items.snowball), shoot);
|
||||
addBehavior(new ItemStack(Items.ender_pearl), shoot);
|
||||
addBehavior(new ItemStack(Items.shears), shear);
|
||||
addBehavior(new LandmineStack(Items.stick), dummy);
|
||||
addBehavior(new LandmineStack(Items.redstone), utilityMode);
|
||||
addBehavior(new LandmineStack(Blocks.torch), blockThrow);
|
||||
addBehavior(new LandmineStack(Items.gunpowder), explosive);
|
||||
addBehavior(new LandmineStack(Blocks.tnt), explosive);
|
||||
addBehavior(new LandmineStack(Items.fireworks), firework);
|
||||
addBehavior(new LandmineStack(Items.potionitem), potion);
|
||||
addBehavior(new LandmineStack(Items.fire_charge), fireball);
|
||||
addBehavior(new LandmineStack(Items.spawn_egg), spawn);
|
||||
addBehavior(new LandmineStack(Items.arrow), shoot);
|
||||
addBehavior(new LandmineStack(Items.snowball), shoot);
|
||||
addBehavior(new LandmineStack(Items.ender_pearl), shoot);
|
||||
addBehavior(new LandmineStack(Items.shears), shear);
|
||||
|
||||
//Make sure the part below this comment is executed last(to avoid conflicts)
|
||||
Iterator i1 = Block.blockRegistry.iterator();
|
||||
@@ -68,7 +64,7 @@ public abstract class Behavior
|
||||
Block b = (Block) ob;
|
||||
if (b.getMaterial().isOpaque() && b.renderAsNormalBlock() && !b.canProvidePower() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b)))
|
||||
{
|
||||
addBehavior(new ItemStack(b), blockThrow);
|
||||
addBehavior(new LandmineStack(b), blockThrow);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -85,7 +81,13 @@ public abstract class Behavior
|
||||
{
|
||||
if (!behaviorsListBlocks.isEmpty())
|
||||
{
|
||||
return behaviorsListBlocks.get(par1ItemStack);
|
||||
for(int i = 0; i < behaviorsListBlocks.size(); i++){
|
||||
LandmineStack st = (LandmineStack) behaviorsListBlocks.keySet().toArray()[i];
|
||||
if(st.equals(par1ItemStack)){
|
||||
return (Behavior) behaviorsListBlocks.values().toArray()[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -96,7 +98,13 @@ public abstract class Behavior
|
||||
{
|
||||
if (!behaviorsListItems.isEmpty())
|
||||
{
|
||||
return behaviorsListItems.get(par1ItemStack);
|
||||
for(int i = 0; i < behaviorsListItems.size(); i++){
|
||||
LandmineStack st = (LandmineStack) behaviorsListItems.keySet().toArray()[i];
|
||||
if(st.equals(par1ItemStack)){
|
||||
return (Behavior) behaviorsListItems.values().toArray()[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -110,20 +118,20 @@ public abstract class Behavior
|
||||
return defaultBehavior;
|
||||
}
|
||||
|
||||
public static void addBehavior (ItemStack par1ItemStack, Behavior par2Behavior)
|
||||
public static void addBehavior (LandmineStack par1LandmineStack, Behavior par2Behavior)
|
||||
{
|
||||
if (par1ItemStack.getItem() instanceof ItemBlock)
|
||||
if (par1LandmineStack.isBlock)
|
||||
{
|
||||
if (!behaviorsListBlocks.containsKey(par1ItemStack))
|
||||
if (!behaviorsListBlocks.containsKey(par1LandmineStack))
|
||||
{
|
||||
behaviorsListBlocks.put(par1ItemStack, par2Behavior);
|
||||
behaviorsListBlocks.put(par1LandmineStack, par2Behavior);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!behaviorsListItems.containsKey(par1ItemStack))
|
||||
if (!behaviorsListItems.containsKey(par1LandmineStack))
|
||||
{
|
||||
behaviorsListItems.put(par1ItemStack, par2Behavior);
|
||||
behaviorsListItems.put(par1LandmineStack, par2Behavior);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user