diff options
author | glowredman <35727266+glowredman@users.noreply.github.com> | 2023-04-18 21:23:49 +0200 |
---|---|---|
committer | glowredman <35727266+glowredman@users.noreply.github.com> | 2023-04-18 21:23:49 +0200 |
commit | 7e9d0149b511f74e3d33a50b04b8dd848e01c66c (patch) | |
tree | 77b16f0c6e03e7fafbf12195f1ed4daed1c41e73 | |
parent | c96227af5cb180a06286b175e83fab0a1455cc3c (diff) | |
download | GT5-Unofficial-7e9d0149b511f74e3d33a50b04b8dd848e01c66c.tar.gz GT5-Unofficial-7e9d0149b511f74e3d33a50b04b8dd848e01c66c.tar.bz2 GT5-Unofficial-7e9d0149b511f74e3d33a50b04b8dd848e01c66c.zip |
Add generics
36 files changed, 64 insertions, 61 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index ae49064f64..f9ccf8ee24 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,17 +203,17 @@ 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; } 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_, List<String> list, boolean p_77624_4_) { list.add(CommonValues.TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + translateToLocal("tooptip.energy.label") + "--"); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index 46dfa94e57..f32029460b 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -26,7 +26,7 @@ public class TurretHeadItemEM 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_, List<String> list, boolean p_77624_4_) { list.add(TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + translateToLocal("tooltip.info") + "--"); diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java index 0166c2302d..9c4a9d4ae6 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; @@ -25,7 +26,7 @@ public class CreativeTabTecTech extends CreativeTabs { } @Override - public void displayAllReleventItems(List stuffToShow) { + public void displayAllReleventItems(List<ItemStack> stuffToShow) { for (CustomItemList item : CustomItemList.values()) { if (item.hasBeenSet() && item.getBlock() == GregTech_API.sBlockMachines) { stuffToShow.add(item.get(1)); diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java index 7de3238cff..2633082518 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java @@ -87,7 +87,7 @@ public class ChunkDataHandler { } else if (!chunkMemory.isLoaded) { chunkMemory.isLoaded = true; - Set<String> tagsDuplicated = new HashSet(loadedKeys); + Set<String> tagsDuplicated = new HashSet<>(loadedKeys); tagsDuplicated.retainAll(chunkMemory.data.func_150296_c()); if (tagsDuplicated.isEmpty()) { @@ -204,7 +204,7 @@ public class ChunkDataHandler { public void registerChunkMetaDataHandler(IChunkMetaDataHandler handler) { metaDataHandlerHashMap.put(handler.getTagName(), handler); dimensionWiseMetaChunkData.put(handler.getTagName(), new HashMap<>()); - Class clazz = handler.getClass(); + Class<?> clazz = handler.getClass(); try { if (clazz.getMethod("tickServer", HashMap.class, TickEvent.ServerTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 98ae87a15b..770d007002 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -44,7 +44,7 @@ public class EyeOfHarmonyRecipe { Materials.Universium.getMolten(1152), Materials.Universium.getMolten(4_608), Materials.Universium.getMolten(18_432) }; - HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<ItemStack>() { + HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<>() { @Override public int computeHashCode(ItemStack stack) { @@ -461,7 +461,7 @@ public class EyeOfHarmonyRecipe { Materials.Oxygen, Materials.Tin).collect(Collectors.toList()); - private static final HashMap<String, Long> plasmaEnergyMap = new HashMap<String, Long>() { + private static final HashMap<String, Long> plasmaEnergyMap = new HashMap<>() { { VALID_PLASMAS.forEach( diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java index 2da0eb5758..a82f8adf9d 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -32,7 +32,7 @@ public class EyeOfHarmonyRecipeStorage { private static final double CHANCE_DECREASE_PER_DIMENSION = 0.05; // Map is unique so this is fine. - HashMap<Block, String> blocksMapInverted = new HashMap<Block, String>() { + HashMap<Block, String> blocksMapInverted = new HashMap<>() { { ModBlocks.blocks.forEach((dimString, dimBlock) -> { put(dimBlock, dimString); }); diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java index 86273974ff..0993aef19f 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java @@ -23,7 +23,7 @@ public class QuantumGlassItem extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(TEC_MARK_EM); aList.add(translateToLocal("tile.quantumGlass.desc.0")); // Dense yet transparent aList.add( diff --git a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java index b97d294e91..9ee98f7774 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java @@ -23,7 +23,7 @@ public class ReactorSimItem extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(TEC_MARK_GENERAL); aList.add(translateToLocal("tile.reactorSim.desc.0")); // Fission Reaction Uncertainty Resolver 9001 aList.add( diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java index 82987db448..fc950fa1a2 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java @@ -219,7 +219,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { } @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 12; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index 8378ea2e4c..c2647985bd 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -188,7 +188,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { } @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 15; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java index da7d5efd01..87c0ce7ae1 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java @@ -25,7 +25,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { if (aStack.getItemDamage() < 15) { aList.add(THETA_MOVEMENT); } else { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java index c362b9aaaf..c06571112b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java @@ -23,7 +23,7 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { if (aStack.getItemDamage() < 15) { aList.add(TEC_MARK_EM); } else { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java index 0f38f5fadf..2492761763 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java @@ -21,7 +21,7 @@ public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java index 728335e754..f40cfeef44 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java @@ -19,7 +19,7 @@ public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java index 0fc4d31f72..3e82a63bb3 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java @@ -19,7 +19,7 @@ public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index b0a890a599..46857b778b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -111,9 +111,8 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index d3d30f0357..3191e59d10 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -108,9 +108,8 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 1d86f4eeb5..56f1c1e0dd 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -111,9 +111,8 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java index 190384e1ce..8df0b63de9 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java +++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java @@ -118,7 +118,7 @@ public class AvrProgrammer extends Item implements IMedia { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { if (aStack.stackTagCompound.hasKey("avr")) { NBTTagCompound avr = aStack.stackTagCompound.getCompoundTag("avr"); aList.add(translateToLocal("item.em.programmer.desc.0") + ": " + avr.getInteger("programCounter")); // Current @@ -215,7 +215,7 @@ public class AvrProgrammer extends Item implements IMedia { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack stack = new ItemStack(item, 1, 0); stack.setTagCompound(new NBTTagCompound()); list.add(stack); diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java index e730caf1e7..255f156765 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java @@ -103,7 +103,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); try { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -131,7 +131,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java index a32fd2adc3..02977907ea 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java @@ -95,7 +95,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); try { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -118,7 +118,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java index 97fda7b051..a915a563b9 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java @@ -75,7 +75,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("content")) { aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.definitionScanStorage.desc.0")); // Contains @@ -113,7 +113,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); list.add(that); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java index 34b0f26685..00a1c29599 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java @@ -29,7 +29,7 @@ public final class EnderFluidLinkCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.enderfluidlinkcover.desc.0")); // Ender-Fluid-Enables Machines! aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.enderfluidlinkcover.desc.1")); // Use on any side diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java index b572dcdc83..645c89880f 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java @@ -152,7 +152,7 @@ public class EuMeterGT extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_GENERAL); aList.add(translateToLocal("item.em.EuMeterGT.desc.0")); // Measures basic EU related stuff aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.EuMeterGT.desc.1")); // Just right click on diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java index 28d5fd22d8..814ef51b59 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java @@ -133,7 +133,7 @@ public final class ParametrizerMemoryCard extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { NBTTagCompound tNBT = aStack.getTagCompound(); aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.em.parametrizerMemoryCard.desc.0")); // Stores Parameters @@ -194,7 +194,7 @@ public final class ParametrizerMemoryCard extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java index a03eae6674..015d284c4e 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java @@ -29,7 +29,7 @@ public final class PowerPassUpgradeCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.powerpassupgradecover.desc.0")); // Add power pass functionality to TecTech // Multiblocks diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 434c106cfa..c98c7246c7 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -33,7 +33,7 @@ public final class TeslaCoilCapacitor extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 6) { aList.add( @@ -100,7 +100,7 @@ public final class TeslaCoilCapacitor extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 6; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java index 366b000273..b4f1d33382 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -32,7 +32,7 @@ public final class TeslaCoilComponent extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.itemTeslaComponent.desc")); // Tesla bois need // these! @@ -65,7 +65,7 @@ public final class TeslaCoilComponent extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { aList.add(new ItemStack(aItem, 1, 0)); aList.add(new ItemStack(aItem, 1, 1)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index 073d29153b..3ee7fd3e93 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -32,7 +32,7 @@ public final class TeslaCoilCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); switch (aStack.getItemDamage()) { case 0: @@ -80,7 +80,7 @@ public final class TeslaCoilCover extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { aList.add(new ItemStack(aItem, 1, 0)); aList.add(new ItemStack(aItem, 1, 1)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java index 28520a2678..b2ffd6bb07 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java @@ -28,7 +28,7 @@ public final class TeslaStaff extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.teslaStaff.desc")); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 080481c17f..c28fe87f11 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -187,7 +187,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB static { try { - Class GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); + Class<?> GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); lServerNames = (LinkedHashMap<String, String>) GT_Assemblyline_Server.getField("lServerNames").get(null); } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { lServerNames = null; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java index 0d15cb3c2f..bc1f7c7d66 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java @@ -315,7 +315,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach } } - protected void hoveringText(List strings, int x, int y, FontRenderer font) { + protected void hoveringText(List<String> strings, int x, int y, FontRenderer font) { if (!strings.isEmpty()) { GL11.glDisable(GL12.GL_RESCALE_NORMAL); // RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java index 2e6f0d9839..74491236b6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java @@ -7,8 +7,8 @@ import java.util.ArrayList; */ public class Parameters { - private static final IStatusFunction LED_STATUS_FUNCTION_DEFAULT = (b, p) -> LedStatus.STATUS_UNDEFINED; - private static final INameFunction NAME_FUNCTION_DEFAULT = (b, p) -> "Undefined"; + private static final IStatusFunction<?> LED_STATUS_FUNCTION_DEFAULT = (b, p) -> LedStatus.STATUS_UNDEFINED; + private static final INameFunction<?> NAME_FUNCTION_DEFAULT = (b, p) -> "Undefined"; final Group[] groups = new Group[10]; @@ -159,13 +159,13 @@ public class Parameters { groups[hatchNo] = this; } - public ParameterIn makeInParameter(int paramID, double defaultValue, INameFunction name, - IStatusFunction status) { + public ParameterIn makeInParameter(int paramID, double defaultValue, INameFunction<?> name, + IStatusFunction<?> status) { return new ParameterIn(paramID, defaultValue, name, status); } - public ParameterOut makeOutParameter(int paramID, double defaultValue, INameFunction name, - IStatusFunction status) { + public ParameterOut makeOutParameter(int paramID, double defaultValue, INameFunction<?> name, + IStatusFunction<?> status) { return new ParameterOut(paramID, defaultValue, name, status); } @@ -206,7 +206,7 @@ public class Parameters { IStatusFunction status; INameFunction name; - private ParameterOut(int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + private ParameterOut(int paramID, double defaultValue, INameFunction<?> name, IStatusFunction<?> status) { this.name = name == null ? NAME_FUNCTION_DEFAULT : name; if (paramID < 0 || paramID > 2) { throw new IllegalArgumentException("Parameter id must be in 0 to 1 range"); @@ -284,7 +284,7 @@ public class Parameters { IStatusFunction status; INameFunction name; - private ParameterIn(int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + private ParameterIn(int paramID, double defaultValue, INameFunction<?> name, IStatusFunction<?> status) { this.name = name == null ? NAME_FUNCTION_DEFAULT : name; this.id = hatchNo + 10 * paramID; if (paramID < 0 || paramID > 2) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java index 1cac23e098..baa4f48c84 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java @@ -487,11 +487,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB // bigger // first colliderHandler = FUSE_HANDLERS.get( - (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); + (long) (stack2.getDefinition().getMatterMassType() << 16) + | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { colliderHandler = FUSE_HANDLERS.get( - (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); + (long) (stack.getDefinition().getMatterMassType() << 16) + | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } for (EMInstanceStack newStack : map.valuesToArray()) { @@ -519,11 +521,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB // bigger // first colliderHandler = FUSE_HANDLERS.get( - (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); + (long) (stack2.getDefinition().getMatterMassType() << 16) + | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { colliderHandler = FUSE_HANDLERS.get( - (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); + (long) (stack.getDefinition().getMatterMassType() << 16) + | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } outputEM = new EMInstanceStackMap[] { map }; diff --git a/src/main/java/com/github/technus/tectech/util/TT_Utility.java b/src/main/java/com/github/technus/tectech/util/TT_Utility.java index fb796b870a..eeee29e269 100644 --- a/src/main/java/com/github/technus/tectech/util/TT_Utility.java +++ b/src/main/java/com/github/technus/tectech/util/TT_Utility.java @@ -381,6 +381,7 @@ public final class TT_Utility { return objects; } + @SafeVarargs public static <T> NBTTagCompound packNBT(Function<T, NBTTagCompound> converter, T... info) { NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("i", info.length); |