Revert "Added code formatter"

This reverts commit b9448d5d90.
This commit is contained in:
modmuss50 2016-03-24 00:41:47 +00:00
parent b9448d5d90
commit 33985f1a31
444 changed files with 26235 additions and 32364 deletions

View file

@ -1,7 +1,5 @@
package techreborn.events;
import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -12,55 +10,44 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
public class OreUnifier
{
import java.util.HashMap;
public static HashMap<String, ItemStack> oreHash = new HashMap<String, ItemStack>();
public class OreUnifier {
@SubscribeEvent
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)
{
int[] oreIds = OreDictionary.getOreIDs(event.player.getHeldItem(EnumHand.MAIN_HAND));
for (int id : oreIds)
{
String oreName = OreDictionary.getOreName(id);
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))
{
ItemStack stack = oreHash.get(oreName).copy();
stack.stackSize = event.player.getHeldItem(EnumHand.MAIN_HAND).stackSize;
stack.setTagCompound(event.player.getHeldItem(EnumHand.MAIN_HAND).getTagCompound());
event.player.inventory.setInventorySlotContents(event.player.inventory.currentItem, stack);
}
}
}
}
}
}
public static HashMap<String, ItemStack> oreHash = new HashMap<String, ItemStack>();
public static void registerOre(String name, ItemStack ore)
{
oreHash.put(name, ore);
OreDictionary.registerOre(name, ore);
}
@SubscribeEvent
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){
int[] oreIds = OreDictionary.getOreIDs(event.player.getHeldItem(EnumHand.MAIN_HAND));
for(int id : oreIds){
String oreName = OreDictionary.getOreName(id);
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)){
ItemStack stack = oreHash.get(oreName).copy();
stack.stackSize = event.player.getHeldItem(EnumHand.MAIN_HAND).stackSize;
stack.setTagCompound(event.player.getHeldItem(EnumHand.MAIN_HAND).getTagCompound());
event.player.inventory.setInventorySlotContents(event.player.inventory.currentItem, stack);
}
}
}
}
}
}
public static void registerOre(String name, Item ore)
{
registerOre(name, new 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) {
registerOre(name, new ItemStack(ore));
}
public static void registerOre(String name, Block ore) {
registerOre(name, new ItemStack(ore));
}
public static void registerOre(String name, Block ore)
{
registerOre(name, new ItemStack(ore));
}
}

View file

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