diff options
Diffstat (limited to 'src/main/java/com')
98 files changed, 404 insertions, 687 deletions
diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java index e343b9fc77..928a4a4e0f 100644 --- a/src/main/java/com/github/technus/tectech/Reference.java +++ b/src/main/java/com/github/technus/tectech/Reference.java @@ -6,7 +6,7 @@ public final class Reference { public static final String MODID = Mods.Names.TECTECH; public static final String NAME = "TecTech - Tec Technology!"; - public static final String VERSION = "GRADLETOKEN_VERSION"; + public static final String VERSION = Tags.VERSION; public static final String COLLECTIONNAME = "TecTech"; public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index ae49064f64..ee68c7123f 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -195,7 +195,7 @@ public class TecTech { } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection<?> c) { return false; } @@ -203,20 +203,21 @@ public class TecTech { public void clear() {} @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection<?> c) { return false; } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection<?> c) { return false; } @Override - public boolean containsAll(Collection c) { + public boolean containsAll(Collection<?> c) { return false; } + @SuppressWarnings("unchecked") @Override public Object[] toArray(Object[] a) { return new Object[0]; diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index f141c52091..4a1a350196 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -22,7 +22,7 @@ public class TurretBaseItemEM extends ItemBlock { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_ |