mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
run repo through formatter
This commit is contained in:
1 parent
5585d680a3
commit
ffaea7d4b7
140 files changed
+1050
-892
No files matched your search
@@ -512,13 +512,13 @@ public class TConstructRegistry
|
||||
* 5: Has rotational TileEntity data
|
||||
* 6: Custom placement logic
|
||||
*/
|
||||
|
||||
|
||||
//moved to TMech
|
||||
//public static HashMap<ItemStack, Integer> drawbridgeState = new HashMap<ItemStack, Integer>();
|
||||
/* Blocks that are interchangable with each other. Ex: Still and flowing water */
|
||||
// static HashMap<Block, Block> interchangableBlockMapping = new HashMap<Block, Block> ();
|
||||
// static HashMap<Block, Block> interchangableBlockMapping = new HashMap<Block, Block> ();
|
||||
/*Blocks that place items, and vice versa */
|
||||
// public static HashBiMap<Block, Item> blockToItemMapping;
|
||||
// public static HashBiMap<Block, Item> blockToItemMapping;
|
||||
|
||||
static void initializeDrawbridgeState ()
|
||||
{
|
||||
|
||||
@@ -111,7 +111,8 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
|
||||
stack.setTagCompound(tags);
|
||||
data = new NBTTagCompound();
|
||||
tags.setTag(SET_NAME, data);
|
||||
data.setDouble("damageReduction", baseProtection); }
|
||||
data.setDouble("damageReduction", baseProtection);
|
||||
}
|
||||
|
||||
data = tags.getCompoundTag(SET_NAME);
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@ public abstract class ArmorMod extends ToolMod
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
protected NBTTagCompound getAttributeTag(String attributeType, String modifierName, double amount, boolean flat, UUID uuid)
|
||||
|
||||
protected NBTTagCompound getAttributeTag (String attributeType, String modifierName, double amount, boolean flat, UUID uuid)
|
||||
{
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
tag.setString("AttributeName", attributeType);
|
||||
|
||||
@@ -103,7 +103,6 @@ public class TConstructClientRegistry
|
||||
recipeIcons.put(name, recipe);
|
||||
}
|
||||
|
||||
|
||||
//Gui
|
||||
public static void addToolButton (ToolGuiElement element)
|
||||
{
|
||||
|
||||
@@ -180,7 +180,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
@Override
|
||||
public void readNetworkNBT (NBTTagCompound tags)
|
||||
{
|
||||
NBTTagList liquidTag = tags.getTagList("Liquids",9);
|
||||
NBTTagList liquidTag = tags.getTagList("Liquids", 9);
|
||||
fluidlist.clear();
|
||||
|
||||
for (int iter = 0; iter < liquidTag.tagCount(); iter++)
|
||||
|
||||
@@ -13,7 +13,6 @@ import mantle.blocks.iface.IFacingLogic;
|
||||
import mantle.blocks.iface.IMasterLogic;
|
||||
import mantle.blocks.iface.IServantLogic;
|
||||
|
||||
|
||||
public class TankLayerScan extends LogicComponent
|
||||
{
|
||||
protected TileEntity master;
|
||||
@@ -497,7 +496,7 @@ public class TankLayerScan extends LogicComponent
|
||||
public void readFromNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.readFromNBT(tags);
|
||||
NBTTagList layerAir = tags.getTagList("AirLayer",11);
|
||||
NBTTagList layerAir = tags.getTagList("AirLayer", 11);
|
||||
if (layerAir != null)
|
||||
{
|
||||
layerAirCoords.clear();
|
||||
@@ -516,7 +515,7 @@ public class TankLayerScan extends LogicComponent
|
||||
|
||||
for (int i = 0; i < blocks.tagCount(); ++i)
|
||||
{
|
||||
int[] coord = blocks.func_150306_c(i);
|
||||
int[] coord = blocks.func_150306_c(i);
|
||||
blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
|
||||
}
|
||||
}
|
||||
@@ -561,7 +560,7 @@ public class TankLayerScan extends LogicComponent
|
||||
NBTTagList air = new NBTTagList();
|
||||
for (CoordTuple coord : airCoords)
|
||||
{
|
||||
air.appendTag(new NBTTagIntArray( new int[] { coord.x, coord.y, coord.z }));
|
||||
air.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
|
||||
}
|
||||
tags.setTag("Air", air);
|
||||
tags.setInteger("structureTop", structureTop);
|
||||
|
||||
@@ -42,6 +42,7 @@ public class Smeltery
|
||||
{
|
||||
addMelting(new ItemStack(item, 1, metadata), item, metadata, temperature, output);
|
||||
}
|
||||
|
||||
/** Adds mappings between a block and its liquid
|
||||
* Example: Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
|
||||
*
|
||||
|
||||
@@ -5,38 +5,44 @@ import mantle.blocks.abstracts.InventoryLogic;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SmelteryEvent extends Event {
|
||||
public class SmelteryEvent extends Event
|
||||
{
|
||||
|
||||
public InventoryLogic component;
|
||||
public int x, y, z;
|
||||
|
||||
public SmelteryEvent(InventoryLogic component, int x, int y, int z)
|
||||
{
|
||||
this.component = component;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
public static class ItemInsertedIntoCasting extends SmelteryEvent
|
||||
{
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player)
|
||||
{
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRemovedFromCasting extends SmelteryEvent
|
||||
{
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player)
|
||||
{
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public InventoryLogic component;
|
||||
public int x, y, z;
|
||||
|
||||
public SmelteryEvent(InventoryLogic component, int x, int y, int z){
|
||||
this.component = component;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
public static class ItemInsertedIntoCasting extends SmelteryEvent {
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) {
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRemovedFromCasting extends SmelteryEvent {
|
||||
public ItemStack item;
|
||||
public EntityPlayer player;
|
||||
|
||||
public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) {
|
||||
super(component, x, y, z);
|
||||
this.item = item;
|
||||
this.player = player;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,16 +5,18 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ToolCraftedEvent extends Event {
|
||||
public class ToolCraftedEvent extends Event
|
||||
{
|
||||
|
||||
public IInventory inventory;
|
||||
public EntityPlayer player;
|
||||
public ItemStack tool;
|
||||
|
||||
public ToolCraftedEvent(IInventory inventory, EntityPlayer player, ItemStack tool)
|
||||
{
|
||||
this.inventory = inventory;
|
||||
this.player = player;
|
||||
this.tool = tool;
|
||||
}
|
||||
|
||||
public IInventory inventory;
|
||||
public EntityPlayer player;
|
||||
public ItemStack tool;
|
||||
|
||||
public ToolCraftedEvent(IInventory inventory, EntityPlayer player, ItemStack tool){
|
||||
this.inventory = inventory;
|
||||
this.player = player;
|
||||
this.tool = tool;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -491,7 +491,7 @@ public class AbilityHelper
|
||||
|
||||
if (event.getResult() == Result.ALLOW)
|
||||
{
|
||||
|
||||
|
||||
onBlockChanged(stack, world, Blocks.air, x, y, z, player, random);
|
||||
return true;
|
||||
}
|
||||
@@ -506,8 +506,8 @@ public class AbilityHelper
|
||||
else
|
||||
{
|
||||
Block block = Blocks.farmland;
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName,
|
||||
(block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
block.stepSound.getPitch() * 0.8F);
|
||||
|
||||
if (world.isRemote)
|
||||
{
|
||||
@@ -633,6 +633,6 @@ public class AbilityHelper
|
||||
d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance();
|
||||
}
|
||||
Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
|
||||
return world.func_147447_a(vec3, vec31, par3, !par3,par3);
|
||||
return world.func_147447_a(vec3, vec31, par3, !par3, par3);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user