Auto Format code

This commit is contained in:
modmuss50 2016-10-08 20:46:16 +01:00
parent 112b1657cf
commit 796df6c055
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
503 changed files with 12260 additions and 16291 deletions

View file

@ -12,46 +12,36 @@ import techreborn.config.ConfigTechReborn;
import java.util.HashMap;
public class OreUnifier
{
public class OreUnifier {
public static HashMap<String, ItemStack> oreHash = new HashMap<>();
public static void registerOre(String name, ItemStack ore)
{
public static void registerOre(String name, ItemStack ore) {
oreHash.put(name, ore);
OreDictionary.registerOre(name, ore);
}
public static void registerOre(String name, Item ore)
{
public static void registerOre(String name, Item ore) {
registerOre(name, new ItemStack(ore));
}
public static void registerOre(String name, Block ore)
{
public static void registerOre(String name, Block ore) {
registerOre(name, new ItemStack(ore));
}
@SubscribeEvent
public void itemTick(TickEvent.PlayerTickEvent event)
{
public void itemTick(TickEvent.PlayerTickEvent event) {
if (ConfigTechReborn.OreUnifer && !event.player.worldObj.isRemote
&& event.player.worldObj.getTotalWorldTime() % 10 == 0)
{
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null)
{
&& event.player.worldObj.getTotalWorldTime() % 10 == 0) {
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null) {
int[] oreIds = OreDictionary.getOreIDs(event.player.getHeldItem(EnumHand.MAIN_HAND));
for (int id : oreIds)
{
for (int id : oreIds) {
String oreName = OreDictionary.getOreName(id);
if (oreHash.containsKey(oreName))
{
if (oreHash.containsKey(oreName)) {
if (ItemUtils.isItemEqual(event.player.getHeldItem(EnumHand.MAIN_HAND), oreHash.get(oreName),
true, true, true)
&& !ItemUtils.isItemEqual(event.player.getHeldItem(EnumHand.MAIN_HAND),
oreHash.get(oreName), true, true, false))
{
true, true, true)
&& !ItemUtils.isItemEqual(event.player.getHeldItem(EnumHand.MAIN_HAND),
oreHash.get(oreName), true, true, false)) {
ItemStack stack = oreHash.get(oreName).copy();
stack.stackSize = event.player.getHeldItem(EnumHand.MAIN_HAND).stackSize;
stack.setTagCompound(event.player.getHeldItem(EnumHand.MAIN_HAND).getTagCompound());

View file

@ -11,21 +11,18 @@ import net.minecraftforge.fml.common.gameevent.TickEvent;
import techreborn.init.ModItems;
import techreborn.power.PowerTickEvent;
public class TRTickHandler
{
public class TRTickHandler {
public Item previouslyWearing;
@SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
public void onPlayerTick(TickEvent.PlayerTickEvent e)
{
public void onPlayerTick(TickEvent.PlayerTickEvent e) {
EntityPlayer player = e.player;
Item chestslot = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null
? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null;
? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null;
if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible()
&& !player.isPotionActive(MobEffects.INVISIBILITY))
{
&& !player.isPotionActive(MobEffects.INVISIBILITY)) {
player.setInvisible(false);
}
@ -33,10 +30,8 @@ public class TRTickHandler
}
@SubscribeEvent
public void worldTick(TickEvent.WorldTickEvent e)
{
if (e.world.isRemote)
{
public void worldTick(TickEvent.WorldTickEvent e) {
if (e.world.isRemote) {
return;
}
MinecraftForge.EVENT_BUS.post(new PowerTickEvent());