aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/effects
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
commitcbe0e497be8e466c380a5b4fa781b314ede9ada3 (patch)
treeb85848b432adf458e3abda466ee46d9dfc3e454b /src/Java/gtPlusPlus/core/item/effects
parentc40416b036c0e89451e1558253ccf07bbee028d0 (diff)
downloadGT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.gz
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.bz2
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.zip
Revert "$ Cleaned up the entire project."
This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/effects')
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityEffect.java22
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityEpic.java18
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityRare.java18
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java14
4 files changed, 40 insertions, 32 deletions
diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java
index 16fe9bf2bf..cd5149b622 100644
--- a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java
@@ -1,12 +1,14 @@
package gtPlusPlus.core.item.effects;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
/*
- *
+ *
This determines the name colour. EnumRarity can be:
EnumRarity.common - the standard white colour.
EnumRarity.uncommon - a yellow colour.
@@ -15,25 +17,25 @@ EnumRarity.epic - the purple colour used on the Golden Apple.
@SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are:
Side.CLIENT is probably the most common one. This marks the method as existing only on the client side.
Side.SERVER marks the method as existing only on the server side.
- *
+ *
*/
public class RarityEffect extends Item {
- public RarityEffect(final int par1) {
+ public RarityEffect(int par1){
super();
this.setCreativeTab(CreativeTabs.tabMaterials);
}
-
+
@Override
@SideOnly(Side.CLIENT)
- public EnumRarity getRarity(final ItemStack par1ItemStack) {
+ public EnumRarity getRarity(ItemStack par1ItemStack){
return EnumRarity.common;
}
-
+
@Override
- public boolean hasEffect(final ItemStack par1ItemStack) {
+ public boolean hasEffect(ItemStack par1ItemStack){
return true;
}
-
+
}
diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java
index 6e313e21e4..35c5527d16 100644
--- a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java
@@ -1,26 +1,28 @@
package gtPlusPlus.core.item.effects;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
public class RarityEpic extends Item {
- public RarityEpic(final int par1) {
+ public RarityEpic(int par1){
super();
this.setCreativeTab(CreativeTabs.tabMaterials);
}
-
+
@Override
@SideOnly(Side.CLIENT)
- public EnumRarity getRarity(final ItemStack par1ItemStack) {
+ public EnumRarity getRarity(ItemStack par1ItemStack){
return EnumRarity.epic;
}
-
+
@Override
- public boolean hasEffect(final ItemStack par1ItemStack) {
+ public boolean hasEffect(ItemStack par1ItemStack){
return true;
}
-
+
}
diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java
index acff879d90..c64accb7aa 100644
--- a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java
@@ -1,26 +1,28 @@
package gtPlusPlus.core.item.effects;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
public class RarityRare extends Item {
- public RarityRare(final int par1) {
+ public RarityRare(int par1){
super();
this.setCreativeTab(CreativeTabs.tabMaterials);
}
-
+
@Override
@SideOnly(Side.CLIENT)
- public EnumRarity getRarity(final ItemStack par1ItemStack) {
+ public EnumRarity getRarity(ItemStack par1ItemStack){
return EnumRarity.rare;
}
-
+
@Override
- public boolean hasEffect(final ItemStack par1ItemStack) {
+ public boolean hasEffect(ItemStack par1ItemStack){
return true;
}
-
+
}
diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java
index c2d78767c3..398217a24a 100644
--- a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java
@@ -1,20 +1,22 @@
package gtPlusPlus.core.item.effects;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.*;
public class RarityUncommon extends Item {
-
+
@Override
@SideOnly(Side.CLIENT)
- public EnumRarity getRarity(final ItemStack par1ItemStack) {
+ public EnumRarity getRarity(ItemStack par1ItemStack){
return EnumRarity.uncommon;
}
-
+
@Override
- public boolean hasEffect(final ItemStack par1ItemStack) {
+ public boolean hasEffect(ItemStack par1ItemStack){
return true;
}
-
+
}