mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
quick fix : Explicit type can be replaced with <>
This commit is contained in:
1 parent
66ba36d6a0
commit
4dc089061c
55 files changed
+132
-132
No files matched your search
@@ -13,7 +13,7 @@ import tconstruct.util.config.PHConstruct;
|
||||
public class TAchievements {
|
||||
|
||||
private static AchievementPage achievementsPage;
|
||||
private static HashMap<String, Achievement> achievementsList = new HashMap<String, Achievement>();
|
||||
private static HashMap<String, Achievement> achievementsList = new HashMap<>();
|
||||
|
||||
/**
|
||||
* Adds an achievement and registers it, so there is no need to call .registerStat
|
||||
|
||||
@@ -66,7 +66,7 @@ public class RenderArmorCast implements IItemRenderer {
|
||||
renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F);
|
||||
renderCube(tessellator, renderer, baseIcon);
|
||||
renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F);
|
||||
ArrayList<ForgeDirection> sides = new ArrayList<ForgeDirection>();
|
||||
ArrayList<ForgeDirection> sides = new ArrayList<>();
|
||||
sides.add(ForgeDirection.NORTH);
|
||||
sides.add(ForgeDirection.SOUTH);
|
||||
sides.add(ForgeDirection.EAST);
|
||||
|
||||
@@ -24,7 +24,7 @@ public class ArmorExtended implements IInventory {
|
||||
public UUID globalID = UUID.fromString("B243BE32-DC1B-4C53-8D13-8752D5C69D5B");
|
||||
|
||||
public void init(EntityPlayer player) {
|
||||
parent = new WeakReference<EntityPlayer>(player);
|
||||
parent = new WeakReference<>(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -17,7 +17,7 @@ public class KnapsackInventory implements IInventory {
|
||||
public WeakReference<EntityPlayer> parent;
|
||||
|
||||
public void init(EntityPlayer player) {
|
||||
parent = new WeakReference<EntityPlayer>(player);
|
||||
parent = new WeakReference<>(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -30,7 +30,7 @@ public class TPlayerHandler {
|
||||
/* Player */
|
||||
// public int hunger;
|
||||
|
||||
private ConcurrentHashMap<UUID, TPlayerStats> playerStats = new ConcurrentHashMap<UUID, TPlayerStats>();
|
||||
private ConcurrentHashMap<UUID, TPlayerStats> playerStats = new ConcurrentHashMap<>();
|
||||
|
||||
@SubscribeEvent
|
||||
public void PlayerLoggedInEvent(PlayerLoggedInEvent event) {
|
||||
@@ -284,7 +284,7 @@ public class TPlayerHandler {
|
||||
|
||||
private final String serverLocation = "https://dl.dropboxusercontent.com/u/42769935/sticks.txt";
|
||||
private final int timeout = 1000;
|
||||
private HashSet<String> stickUsers = new HashSet<String>();
|
||||
private HashSet<String> stickUsers = new HashSet<>();
|
||||
|
||||
public void buildStickURLDatabase(String location) {
|
||||
URL url;
|
||||
|
||||
@@ -44,7 +44,7 @@ public class TPlayerStats
|
||||
}
|
||||
|
||||
public TPlayerStats(EntityPlayer entityplayer) {
|
||||
this.player = new WeakReference<EntityPlayer>(entityplayer);
|
||||
this.player = new WeakReference<>(entityplayer);
|
||||
this.armor = new ArmorExtended();
|
||||
this.armor.init(entityplayer);
|
||||
|
||||
@@ -85,7 +85,7 @@ public class TPlayerStats
|
||||
|
||||
@Override
|
||||
public void init(Entity entity, World world) {
|
||||
this.player = new WeakReference<EntityPlayer>((EntityPlayer) entity);
|
||||
this.player = new WeakReference<>((EntityPlayer) entity);
|
||||
this.armor.init((EntityPlayer) entity);
|
||||
this.knapsack.init((EntityPlayer) entity);
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable {
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
|
||||
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
||||
ArrayList<ItemStack> ret = new ArrayList<>();
|
||||
if (world.rand.nextInt(8) != 0) {
|
||||
return ret;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable {
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) {
|
||||
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
||||
ArrayList<ItemStack> ret = new ArrayList<>();
|
||||
ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z)));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -29,8 +29,8 @@ public class ModifierPage extends BookPage {
|
||||
icons = MantleClientRegistry.getRecipeIcons(recipe);
|
||||
|
||||
if (type.equals("travelmulti")) {
|
||||
List<ItemStack[]> stacks = new LinkedList<ItemStack[]>();
|
||||
List<String> tools = new LinkedList<String>();
|
||||
List<ItemStack[]> stacks = new LinkedList<>();
|
||||
List<String> tools = new LinkedList<>();
|
||||
String[] suffixes = new String[] {"goggles", "vest", "wings", "boots", "glove", "belt"};
|
||||
for (String suffix : suffixes) {
|
||||
ItemStack[] icons2 =
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.network.play.client.C0DPacketCloseWindow;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
|
||||
public class TabRegistry {
|
||||
private static ArrayList<AbstractTab> tabList = new ArrayList<AbstractTab>();
|
||||
private static ArrayList<AbstractTab> tabList = new ArrayList<>();
|
||||
|
||||
public static void registerTab(AbstractTab tab) {
|
||||
tabList.add(tab);
|
||||
|
||||
@@ -22,8 +22,8 @@ public class TProxyCommon implements IGuiHandler {
|
||||
return null;
|
||||
}
|
||||
|
||||
private static HashMap<Integer, IGuiHandler> serverGuiHandlers = new HashMap<Integer, IGuiHandler>();
|
||||
private static HashMap<Integer, IGuiHandler> clientGuiHandlers = new HashMap<Integer, IGuiHandler>();
|
||||
private static HashMap<Integer, IGuiHandler> serverGuiHandlers = new HashMap<>();
|
||||
private static HashMap<Integer, IGuiHandler> clientGuiHandlers = new HashMap<>();
|
||||
|
||||
public static void registerServerGuiHandler(int gui, IGuiHandler handler) {
|
||||
serverGuiHandlers.put(gui, handler);
|
||||
|
||||
@@ -428,23 +428,23 @@ public abstract class BowBase extends ToolCore {
|
||||
public IIcon arrow2;
|
||||
public IIcon arrow3;
|
||||
|
||||
public HashMap<Integer, IIcon> headIcons1 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> handleIcons1 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons1 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> extraIcons1 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> effectIcons1 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> headIcons1 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> handleIcons1 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons1 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> extraIcons1 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> effectIcons1 = new HashMap<>();
|
||||
|
||||
public HashMap<Integer, IIcon> headIcons2 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> handleIcons2 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons2 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> extraIcons2 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> effectIcons2 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> headIcons2 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> handleIcons2 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons2 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> extraIcons2 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> effectIcons2 = new HashMap<>();
|
||||
|
||||
public HashMap<Integer, IIcon> headIcons3 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> handleIcons3 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons3 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> extraIcons3 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> effectIcons3 = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> headIcons3 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> handleIcons3 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons3 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> extraIcons3 = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> effectIcons3 = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
|
||||
|
||||
@@ -21,7 +21,7 @@ public class SlimeBounceHandler {
|
||||
private static final double[] ASINE_TAB;
|
||||
private static final double[] COS_TAB;
|
||||
public static final IdentityHashMap<EntityLivingBase, BounceInfo> BOUNCING_ENTITIES =
|
||||
new IdentityHashMap<EntityLivingBase, BounceInfo>();
|
||||
new IdentityHashMap<>();
|
||||
|
||||
static {
|
||||
for (int i = 0; i < 65536; ++i) {
|
||||
|
||||
@@ -45,7 +45,7 @@ public class TConstructRegistry {
|
||||
* chiselHead scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade,
|
||||
* hammerHead bowstring, fletching, arrowhead
|
||||
*/
|
||||
public static HashMap<String, Item> itemDirectory = new HashMap<String, Item>();
|
||||
public static HashMap<String, Item> itemDirectory = new HashMap<>();
|
||||
|
||||
/**
|
||||
* Adds an item to the directory
|
||||
@@ -95,7 +95,7 @@ public class TConstructRegistry {
|
||||
* scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowString,
|
||||
* fletching, arrowHead
|
||||
*/
|
||||
static HashMap<String, ItemStack> itemstackDirectory = new HashMap<String, ItemStack>();
|
||||
static HashMap<String, ItemStack> itemstackDirectory = new HashMap<>();
|
||||
|
||||
/**
|
||||
* Adds an itemstack to the directory
|
||||
@@ -126,7 +126,7 @@ public class TConstructRegistry {
|
||||
return ret;
|
||||
}
|
||||
|
||||
public static ArrayList<ToolCore> tools = new ArrayList<ToolCore>(20);
|
||||
public static ArrayList<ToolCore> tools = new ArrayList<>(20);
|
||||
|
||||
// Parts
|
||||
|
||||
@@ -134,7 +134,7 @@ public class TConstructRegistry {
|
||||
* List: Item ID, metadata, material ID ItemStack: Output. Ex: Cactus
|
||||
* Binding
|
||||
*/
|
||||
public static HashMap<List, ItemStack> patternPartMapping = new HashMap<List, ItemStack>();
|
||||
public static HashMap<List, ItemStack> patternPartMapping = new HashMap<>();
|
||||
|
||||
/**
|
||||
* Maps an item and a material ID to an output part
|
||||
@@ -197,10 +197,10 @@ public class TConstructRegistry {
|
||||
}
|
||||
|
||||
// Materials
|
||||
public static HashMap<Integer, ToolMaterial> toolMaterials = new HashMap<Integer, ToolMaterial>(40);
|
||||
public static HashMap<String, ToolMaterial> toolMaterialStrings = new HashMap<String, ToolMaterial>(40);
|
||||
public static List<Integer> defaultToolPartMaterials = new LinkedList<Integer>();
|
||||
public static List<Integer> defaultShardMaterials = new LinkedList<Integer>();
|
||||
public static HashMap<Integer, ToolMaterial> toolMaterials = new HashMap<>(40);
|
||||
public static HashMap<String, ToolMaterial> toolMaterialStrings = new HashMap<>(40);
|
||||
public static List<Integer> defaultToolPartMaterials = new LinkedList<>();
|
||||
public static List<Integer> defaultShardMaterials = new LinkedList<>();
|
||||
|
||||
public static void addDefaultToolPartMaterial(int materialID) {
|
||||
if (!toolMaterials.containsKey(materialID))
|
||||
@@ -465,7 +465,7 @@ public class TConstructRegistry {
|
||||
}
|
||||
|
||||
// Bow materials
|
||||
public static HashMap<Integer, BowMaterial> bowMaterials = new HashMap<Integer, BowMaterial>(40);
|
||||
public static HashMap<Integer, BowMaterial> bowMaterials = new HashMap<>(40);
|
||||
|
||||
@Deprecated
|
||||
public static void addBowMaterial(int materialID, int durability, int drawSpeed, float speedMax) {
|
||||
@@ -488,7 +488,7 @@ public class TConstructRegistry {
|
||||
return bowMaterials.get(materialID);
|
||||
}
|
||||
|
||||
public static HashMap<Integer, ArrowMaterial> arrowMaterials = new HashMap<Integer, ArrowMaterial>(40);
|
||||
public static HashMap<Integer, ArrowMaterial> arrowMaterials = new HashMap<>(40);
|
||||
|
||||
@Deprecated
|
||||
public static void addArrowMaterial(int materialID, float mass, float breakChance, float accuracy) {
|
||||
@@ -513,7 +513,7 @@ public class TConstructRegistry {
|
||||
}
|
||||
|
||||
// Custom materials - bowstrings, fletching, etc
|
||||
public static ArrayList<CustomMaterial> customMaterials = new ArrayList<CustomMaterial>();
|
||||
public static ArrayList<CustomMaterial> customMaterials = new ArrayList<>();
|
||||
|
||||
public static void addCustomMaterial(CustomMaterial mat) {
|
||||
if (mat != null) customMaterials.add(mat);
|
||||
@@ -658,8 +658,8 @@ public class TConstructRegistry {
|
||||
}
|
||||
}
|
||||
|
||||
public static ArrayList<ActiveToolMod> activeModifiers = new ArrayList<ActiveToolMod>();
|
||||
public static LinkedList<ActiveArmorMod> activeArmorModifiers = new LinkedList<ActiveArmorMod>();
|
||||
public static ArrayList<ActiveToolMod> activeModifiers = new ArrayList<>();
|
||||
public static LinkedList<ActiveArmorMod> activeArmorModifiers = new LinkedList<>();
|
||||
|
||||
public static void registerActiveToolMod(ActiveToolMod mod) {
|
||||
activeModifiers.add(mod);
|
||||
|
||||
@@ -11,7 +11,7 @@ public abstract class ArmorModTypeFilter extends ArmorMod {
|
||||
super(effect, dataKey, armorTypes, items);
|
||||
assert items.length == values.length
|
||||
: "Itemstacks and their values for armor modifiers must be the same length";
|
||||
this.increase = new ArrayList<Integer>();
|
||||
this.increase = new ArrayList<>();
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
increase.add(values[i]);
|
||||
}
|
||||
|
||||
@@ -9,11 +9,11 @@ import tconstruct.library.crafting.ModifyBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
|
||||
public class TConstructClientRegistry {
|
||||
public static ArrayList<StencilGuiElement> stencilButtons = new ArrayList<StencilGuiElement>();
|
||||
public static ArrayList<StencilGuiElement> stencilButtons2 = new ArrayList<StencilGuiElement>();
|
||||
public static ArrayList<ToolGuiElement> toolButtons = new ArrayList<ToolGuiElement>(20);
|
||||
public static ArrayList<ToolGuiElement> tierTwoButtons = new ArrayList<ToolGuiElement>();
|
||||
public static Map<String, ItemStack> manualIcons = new HashMap<String, ItemStack>();
|
||||
public static ArrayList<StencilGuiElement> stencilButtons = new ArrayList<>();
|
||||
public static ArrayList<StencilGuiElement> stencilButtons2 = new ArrayList<>();
|
||||
public static ArrayList<ToolGuiElement> toolButtons = new ArrayList<>(20);
|
||||
public static ArrayList<ToolGuiElement> tierTwoButtons = new ArrayList<>();
|
||||
public static Map<String, ItemStack> manualIcons = new HashMap<>();
|
||||
public static ItemStack defaultStack = new ItemStack(Items.iron_ingot);
|
||||
|
||||
public static void addMaterialRenderMapping(
|
||||
|
||||
@@ -6,7 +6,7 @@ import net.minecraftforge.fluids.*;
|
||||
import tconstruct.library.crafting.Smeltery;
|
||||
|
||||
public class MultiFluidTank extends LogicComponent implements IFluidTank {
|
||||
public ArrayList<FluidStack> fluidlist = new ArrayList<FluidStack>();
|
||||
public ArrayList<FluidStack> fluidlist = new ArrayList<>();
|
||||
protected int maxLiquid;
|
||||
protected int currentLiquid;
|
||||
|
||||
|
||||
@@ -19,12 +19,12 @@ public class TankLayerScan extends LogicComponent {
|
||||
protected int bricks = 0;
|
||||
protected int airBlocks = 0;
|
||||
protected int structureTop = 0;
|
||||
protected HashSet<CoordTuple> layerBlockCoords = new HashSet<CoordTuple>();
|
||||
protected HashSet<CoordTuple> layerAirCoords = new HashSet<CoordTuple>();
|
||||
protected HashSet<CoordTuple> layerBlockCoords = new HashSet<>();
|
||||
protected HashSet<CoordTuple> layerAirCoords = new HashSet<>();
|
||||
|
||||
public ArrayList<CoordTuple> blockCoords = new ArrayList<CoordTuple>();
|
||||
public ArrayList<CoordTuple> airCoords = new ArrayList<CoordTuple>();
|
||||
protected ArrayList<int[]> validAirCoords = new ArrayList<int[]>();
|
||||
public ArrayList<CoordTuple> blockCoords = new ArrayList<>();
|
||||
public ArrayList<CoordTuple> airCoords = new ArrayList<>();
|
||||
protected ArrayList<int[]> validAirCoords = new ArrayList<>();
|
||||
protected CoordTuple returnStone;
|
||||
|
||||
private static boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null;
|
||||
@@ -110,8 +110,8 @@ public class TankLayerScan extends LogicComponent {
|
||||
|
||||
if (sealed) {
|
||||
blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); // Don't forget me!
|
||||
layerAirCoords = new HashSet<CoordTuple>(airCoords);
|
||||
layerBlockCoords = new HashSet<CoordTuple>(blockCoords);
|
||||
layerAirCoords = new HashSet<>(airCoords);
|
||||
layerBlockCoords = new HashSet<>(blockCoords);
|
||||
|
||||
int lowY = recurseStructureDown(master.yCoord - 1);
|
||||
if (lowY != -1) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
|
||||
public class Detailing {
|
||||
public List<DetailInput> detailing = new ArrayList<DetailInput>();
|
||||
public List<DetailInput> detailing = new ArrayList<>();
|
||||
|
||||
public void addDetailing(Object input, int inputMeta, Object output, int outputMeta, ToolCore tool) {
|
||||
ItemStack iID, oID;
|
||||
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.item.*;
|
||||
|
||||
public class DryingRackRecipes {
|
||||
public static ArrayList<DryingRecipe> recipes = new ArrayList<DryingRecipe>();
|
||||
public static ArrayList<DryingRecipe> recipes = new ArrayList<>();
|
||||
|
||||
public static void addDryingRecipe(Object input, int time, Object output) {
|
||||
ItemStack inputItem = null;
|
||||
|
||||
@@ -11,7 +11,7 @@ public class FluidType {
|
||||
public final Fluid fluid;
|
||||
public final boolean isToolpart;
|
||||
|
||||
public static HashMap<String, FluidType> fluidTypes = new HashMap<String, FluidType>();
|
||||
public static HashMap<String, FluidType> fluidTypes = new HashMap<>();
|
||||
|
||||
public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) {
|
||||
this.renderBlock = block;
|
||||
|
||||
@@ -8,7 +8,7 @@ import tconstruct.library.client.FluidRenderProperties;
|
||||
/* Melting becomes hardened */
|
||||
public class LiquidCasting {
|
||||
// public static LiquidCasting instance = new LiquidCasting();
|
||||
private final ArrayList<CastingRecipe> casts = new ArrayList<CastingRecipe>();
|
||||
private final ArrayList<CastingRecipe> casts = new ArrayList<>();
|
||||
|
||||
private boolean contains(CastingRecipe recipe) {
|
||||
for (CastingRecipe c : casts) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import tconstruct.library.modifier.*;
|
||||
|
||||
public class ModifyBuilder {
|
||||
public static ModifyBuilder instance = new ModifyBuilder();
|
||||
public List<ItemModifier> itemModifiers = new ArrayList<ItemModifier>();
|
||||
public List<ItemModifier> itemModifiers = new ArrayList<>();
|
||||
|
||||
public ItemStack modifyItem(ItemStack input, ItemStack[] modifiers) {
|
||||
ItemStack copy = input.copy(); // Prevent modifying the original
|
||||
|
||||
@@ -14,11 +14,11 @@ import tconstruct.library.util.IPattern;
|
||||
public class PatternBuilder {
|
||||
public static PatternBuilder instance = new PatternBuilder();
|
||||
// Map items to their parts with a hashmap
|
||||
public List<ItemKey> materials = new ArrayList<ItemKey>();
|
||||
public HashMap<String, MaterialSet> materialSets = new HashMap<String, MaterialSet>();
|
||||
public List<ItemKey> materials = new ArrayList<>();
|
||||
public HashMap<String, MaterialSet> materialSets = new HashMap<>();
|
||||
|
||||
// We could use IRecipe if it wasn't tied to InventoryCrafting
|
||||
public List<IPattern> toolPatterns = new ArrayList<IPattern>();
|
||||
public List<IPattern> toolPatterns = new ArrayList<>();
|
||||
|
||||
/* Register methods */
|
||||
public void registerMaterial(ItemStack material, int value, String key) {
|
||||
|
||||
@@ -11,11 +11,11 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
public class Smeltery {
|
||||
public static Smeltery instance = new Smeltery();
|
||||
|
||||
private final Map<ItemMetaWrapper, FluidStack> smeltingList = new HashMap<ItemMetaWrapper, FluidStack>();
|
||||
private final Map<ItemMetaWrapper, Integer> temperatureList = new HashMap<ItemMetaWrapper, Integer>();
|
||||
private final Map<ItemMetaWrapper, ItemStack> renderIndex = new HashMap<ItemMetaWrapper, ItemStack>();
|
||||
private final List<AlloyMix> alloys = new ArrayList<AlloyMix>();
|
||||
private final Map<Fluid, Integer[]> smelteryFuels = new HashMap<Fluid, Integer[]>(); // fluid -> [power, duration]
|
||||
private final Map<ItemMetaWrapper, FluidStack> smeltingList = new HashMap<>();
|
||||
private final Map<ItemMetaWrapper, Integer> temperatureList = new HashMap<>();
|
||||
private final Map<ItemMetaWrapper, ItemStack> renderIndex = new HashMap<>();
|
||||
private final List<AlloyMix> alloys = new ArrayList<>();
|
||||
private final Map<Fluid, Integer[]> smelteryFuels = new HashMap<>(); // fluid -> [power, duration]
|
||||
|
||||
/**
|
||||
* Add a new fluid as a valid Smeltery fuel.
|
||||
|
||||
@@ -8,8 +8,8 @@ public class StencilBuilder {
|
||||
public static StencilBuilder instance = new StencilBuilder();
|
||||
|
||||
public List<ItemStack> blanks =
|
||||
new LinkedList<ItemStack>(); // i wish ItemStack would support equals so i could use a Set here...
|
||||
public Map<Integer, ItemStack> stencils = new TreeMap<Integer, ItemStack>();
|
||||
new LinkedList<>(); // i wish ItemStack would support equals so i could use a Set here...
|
||||
public Map<Integer, ItemStack> stencils = new TreeMap<>();
|
||||
|
||||
/**
|
||||
* Returns whether the given ItemStack is a blank pattern and therefore usable for stencil crafting.
|
||||
|
||||
@@ -16,9 +16,9 @@ import tconstruct.library.util.IToolPart;
|
||||
public class ToolBuilder {
|
||||
public static ToolBuilder instance = new ToolBuilder();
|
||||
|
||||
public HashMap<String, ToolRecipe> recipeList = new HashMap<String, ToolRecipe>();
|
||||
public List<ToolRecipe> combos = new ArrayList<ToolRecipe>();
|
||||
public HashMap<String, String> modifiers = new HashMap<String, String>();
|
||||
public HashMap<String, ToolRecipe> recipeList = new HashMap<>();
|
||||
public List<ToolRecipe> combos = new ArrayList<>();
|
||||
public HashMap<String, String> modifiers = new HashMap<>();
|
||||
|
||||
/* Build tools */
|
||||
public static void addNormalToolRecipe(ToolCore output, Item head, Item handle) {
|
||||
|
||||
@@ -11,10 +11,10 @@ import tconstruct.library.tools.ToolCore;
|
||||
*/
|
||||
|
||||
public class ToolRecipe {
|
||||
protected LinkedList<Item> headList = new LinkedList<Item>();
|
||||
protected LinkedList<Item> handleList = new LinkedList<Item>();
|
||||
protected LinkedList<Item> accessoryList = new LinkedList<Item>();
|
||||
protected LinkedList<Item> extraList = new LinkedList<Item>();
|
||||
protected LinkedList<Item> headList = new LinkedList<>();
|
||||
protected LinkedList<Item> handleList = new LinkedList<>();
|
||||
protected LinkedList<Item> accessoryList = new LinkedList<>();
|
||||
protected LinkedList<Item> extraList = new LinkedList<>();
|
||||
protected ToolCore result;
|
||||
protected Item toolRod = TConstructRegistry.getItem("toolRod");
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ public abstract class HarvestTool extends ToolCore {
|
||||
|
||||
@Override
|
||||
public Set<String> getToolClasses(ItemStack stack) {
|
||||
Set<String> set = new HashSet<String>();
|
||||
Set<String> set = new HashSet<>();
|
||||
|
||||
if (stack != null && stack.getItem() instanceof HarvestTool) {
|
||||
set.add(((HarvestTool) stack.getItem()).getHarvestType());
|
||||
|
||||
@@ -110,20 +110,20 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq
|
||||
|
||||
/* Rendering */
|
||||
|
||||
public HashMap<Integer, IIcon> headIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> brokenIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> handleIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> effectIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> extraIcons = new HashMap<Integer, IIcon>();
|
||||
public HashMap<Integer, IIcon> headIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> brokenIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> handleIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> accessoryIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> effectIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon> extraIcons = new HashMap<>();
|
||||
|
||||
// Not liking this
|
||||
public HashMap<Integer, String> headStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> brokenPartStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> handleStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> accessoryStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> effectStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> extraStrings = new HashMap<Integer, String>();
|
||||
public HashMap<Integer, String> headStrings = new HashMap<>();
|
||||
public HashMap<Integer, String> brokenPartStrings = new HashMap<>();
|
||||
public HashMap<Integer, String> handleStrings = new HashMap<>();
|
||||
public HashMap<Integer, String> accessoryStrings = new HashMap<>();
|
||||
public HashMap<Integer, String> effectStrings = new HashMap<>();
|
||||
public HashMap<Integer, String> extraStrings = new HashMap<>();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.util.StatCollector;
|
||||
public final class HarvestLevels {
|
||||
private HarvestLevels() {} // non-instantiable
|
||||
|
||||
public static final Map<Integer, String> harvestLevelNames = new HashMap<Integer, String>();
|
||||
public static final Map<Integer, String> harvestLevelNames = new HashMap<>();
|
||||
|
||||
public static String getHarvestLevelName(int num) {
|
||||
return harvestLevelNames.containsKey(num) ? harvestLevelNames.get(num) : String.valueOf(num);
|
||||
|
||||
@@ -207,11 +207,11 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe
|
||||
public abstract void playFiringSound(
|
||||
World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy);
|
||||
|
||||
public HashMap<Integer, IIcon[]> animationHeadIcons = new HashMap<Integer, IIcon[]>();
|
||||
public HashMap<Integer, IIcon[]> animationHandleIcons = new HashMap<Integer, IIcon[]>();
|
||||
public HashMap<Integer, IIcon[]> animationAccessoryIcons = new HashMap<Integer, IIcon[]>();
|
||||
public HashMap<Integer, IIcon[]> animationExtraIcons = new HashMap<Integer, IIcon[]>();
|
||||
public HashMap<Integer, IIcon[]> animationEffectIcons = new HashMap<Integer, IIcon[]>();
|
||||
public HashMap<Integer, IIcon[]> animationHeadIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon[]> animationHandleIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon[]> animationAccessoryIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon[]> animationExtraIcons = new HashMap<>();
|
||||
public HashMap<Integer, IIcon[]> animationEffectIcons = new HashMap<>();
|
||||
|
||||
/**
|
||||
* return true if the current renderpass should use animations.
|
||||
|
||||
@@ -17,8 +17,8 @@ import tconstruct.mechworks.landmine.*;
|
||||
*/
|
||||
public abstract class Behavior {
|
||||
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListItems = new HashMap<LandmineStack, Behavior>();
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListBlocks = new HashMap<LandmineStack, Behavior>();
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListItems = new HashMap<>();
|
||||
public static HashMap<LandmineStack, Behavior> behaviorsListBlocks = new HashMap<>();
|
||||
protected static Behavior defaultBehavior;
|
||||
|
||||
public static Behavior dummy = new BehaviorDummy();
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
*/
|
||||
public abstract class SpecialStackHandler {
|
||||
|
||||
public static ArrayList<SpecialStackHandler> handlers = new ArrayList<SpecialStackHandler>();
|
||||
public static ArrayList<SpecialStackHandler> handlers = new ArrayList<>();
|
||||
|
||||
public static void registerBuiltInStackHandlers() {
|
||||
addSpecialBehavior(new SpecialStackHandlerRocketFireball());
|
||||
|
||||
@@ -39,7 +39,7 @@ public class LandmineExplodeLogic {
|
||||
boolean isOffensive = true;
|
||||
boolean cancelDefault = false;
|
||||
|
||||
ArrayList<ItemStack> stacks = new ArrayList<ItemStack>();
|
||||
ArrayList<ItemStack> stacks = new ArrayList<>();
|
||||
boolean hasExploded = false;
|
||||
|
||||
if (tileEntity == null) {
|
||||
|
||||
@@ -10,7 +10,7 @@ public abstract class ItemModTypeFilter extends ItemModifier {
|
||||
public ItemModTypeFilter(int effect, String dataKey, ItemStack[] items, int[] values) {
|
||||
super(items, effect, dataKey);
|
||||
assert items.length == values.length : "Itemstacks and their values for tool modifiers must be the same length";
|
||||
this.increase = new ArrayList<Integer>();
|
||||
this.increase = new ArrayList<>();
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
increase.add(values[i]);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public class ModAmmoRestock extends ItemModifier {
|
||||
NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
|
||||
// correct material?
|
||||
|
||||
Set<Integer> materials = new HashSet<Integer>();
|
||||
Set<Integer> materials = new HashSet<>();
|
||||
materials.add(tags.getInteger("Head"));
|
||||
// shuriken allow all their components
|
||||
if (tool.getItem() instanceof Shuriken) {
|
||||
|
||||
@@ -11,7 +11,7 @@ import tconstruct.util.config.PHConstruct;
|
||||
/* TE3 support */
|
||||
|
||||
public class ModFlux extends ModBoolean {
|
||||
public ArrayList<ItemStack> batteries = new ArrayList<ItemStack>();
|
||||
public ArrayList<ItemStack> batteries = new ArrayList<>();
|
||||
public int modifiersRequired = 1; // LALALALA totally not hidden IguanaTweaks Support LALALALA
|
||||
|
||||
public ModFlux() {
|
||||
|
||||
@@ -16,7 +16,7 @@ public class GrindableHorse implements IFactoryGrindable {
|
||||
|
||||
@Override
|
||||
public List<MobDrop> grind(World world, EntityLivingBase entity, Random random) {
|
||||
List<MobDrop> drops = new ArrayList<MobDrop>();
|
||||
List<MobDrop> drops = new ArrayList<>();
|
||||
|
||||
drops.add(new MobDrop(10, new ItemStack(TinkerTools.materials, random.nextInt(4) + 1, 36)));
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase {
|
||||
private int minAmount;
|
||||
|
||||
public CachedAlloyingRecipe(AlloyMix recipe) {
|
||||
this.fluidTanks = new ArrayList<FluidTankElement>();
|
||||
this.fluidTanks = new ArrayList<>();
|
||||
|
||||
int maxAmount = recipe.mixers.get(0).amount;
|
||||
int mult = 1;
|
||||
|
||||
@@ -21,7 +21,7 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase {
|
||||
public CachedCastingRecipe(CastingRecipe recipe) {
|
||||
this.metal = new FluidTankElement(MOLTEN_FLOW, recipe.castingMetal.amount, recipe.castingMetal);
|
||||
this.metal.flowingTexture = true;
|
||||
this.resources = new ArrayList<PositionedStack>();
|
||||
this.resources = new ArrayList<>();
|
||||
if (recipe.cast != null) {
|
||||
this.resources.add(new PositionedStack(recipe.cast, 55, 19));
|
||||
} else {
|
||||
@@ -42,7 +42,7 @@ public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase {
|
||||
|
||||
@Override
|
||||
public List<FluidTankElement> getFluidTanks() {
|
||||
List<FluidTankElement> res = new ArrayList<FluidTankElement>();
|
||||
List<FluidTankElement> res = new ArrayList<>();
|
||||
res.add(this.metal);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase {
|
||||
public List<CastingRecipe> getCastingRecipes() {
|
||||
LiquidCasting casting = TConstructRegistry.getBasinCasting();
|
||||
if (casting == null) {
|
||||
return new ArrayList<CastingRecipe>();
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return casting.getCastingRecipes();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase {
|
||||
public List<CastingRecipe> getCastingRecipes() {
|
||||
LiquidCasting casting = TConstructRegistry.getTableCasting();
|
||||
if (casting == null) {
|
||||
return new ArrayList<CastingRecipe>();
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return casting.getCastingRecipes();
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase {
|
||||
|
||||
@Override
|
||||
public List<FluidTankElement> getFluidTanks() {
|
||||
List<FluidTankElement> tanks = new ArrayList<FluidTankElement>();
|
||||
List<FluidTankElement> tanks = new ArrayList<>();
|
||||
tanks.add(this.output);
|
||||
return tanks;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase {
|
||||
public ArrowMaterial arrowMaterial;
|
||||
|
||||
public CachedToolMaterialsRecipe(List<ItemStack> toolParts, int materialID) {
|
||||
this.toolParts = new ArrayList<PositionedStack>();
|
||||
this.toolParts = new ArrayList<>();
|
||||
for (ItemStack stack : toolParts) {
|
||||
this.toolParts.add(new PositionedStack(stack, 10, 10));
|
||||
}
|
||||
@@ -41,7 +41,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase {
|
||||
}
|
||||
|
||||
public CachedToolMaterialsRecipe(List<ItemStack> toolParts, int materialID, boolean arrowBow) {
|
||||
this.toolParts = new ArrayList<PositionedStack>();
|
||||
this.toolParts = new ArrayList<>();
|
||||
for (ItemStack stack : toolParts) {
|
||||
this.toolParts.add(new PositionedStack(stack, 10, 10));
|
||||
}
|
||||
@@ -214,7 +214,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase {
|
||||
if (outputId.equals(this.getRecipeID())) {
|
||||
ToolMaterial mat;
|
||||
for (int matID : TConstructRegistry.toolMaterials.keySet()) {
|
||||
List<ItemStack> toolParts = new ArrayList<ItemStack>();
|
||||
List<ItemStack> toolParts = new ArrayList<>();
|
||||
|
||||
mat = TConstructRegistry.toolMaterials.get(matID);
|
||||
for (ItemKey key : PatternBuilder.instance.materials) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
|
||||
public class ActiveContainer extends Container {
|
||||
public List<ActiveSlot> activeInventorySlots = new ArrayList<ActiveSlot>();
|
||||
public List<ActiveSlot> activeInventorySlots = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
||||
|
||||
@@ -73,7 +73,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
public int[] meltingTemps; // values are multiplied by 10
|
||||
private int tick;
|
||||
|
||||
public ArrayList<FluidStack> moltenMetal = new ArrayList<FluidStack>();
|
||||
public ArrayList<FluidStack> moltenMetal = new ArrayList<>();
|
||||
public int maxLiquid;
|
||||
public int currentLiquid;
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public final class ToolStationGuiHelper {
|
||||
: stack.getDisplayName();
|
||||
Item item = stack.getItem();
|
||||
NBTTagCompound tags = stack.getTagCompound();
|
||||
Collection<String> categories = new LinkedList<String>();
|
||||
Collection<String> categories = new LinkedList<>();
|
||||
|
||||
// initialize drawing variables
|
||||
xPos = x;
|
||||
|
||||
@@ -73,7 +73,7 @@ public class Pattern extends CraftingItem implements IPattern {
|
||||
|
||||
// 2 for full material, 1 for half.
|
||||
private static Map<Integer, Integer> buildPatternCostMap() {
|
||||
Map<Integer, Integer> map = new HashMap<Integer, Integer>();
|
||||
Map<Integer, Integer> map = new HashMap<>();
|
||||
|
||||
map.put(0, 2);
|
||||
map.put(1, 1);
|
||||
|
||||
@@ -15,12 +15,12 @@ public class EnvironmentChecks {
|
||||
* logs if so. Note: This code adds additional data to crashlogs. It does
|
||||
* not trigger any crashes.
|
||||
*/
|
||||
private static List<String> incompatibilities = new ArrayList<String>();
|
||||
private static List<String> incompatibilities = new ArrayList<>();
|
||||
|
||||
private static EnvironmentChecks instance = new EnvironmentChecks();
|
||||
|
||||
public static void verifyEnvironmentSanity() {
|
||||
List<String> modIds = new ArrayList<String>();
|
||||
List<String> modIds = new ArrayList<>();
|
||||
|
||||
// Bukkit/Magic Launcher/Optifine are caught by Mantle, so we no longer
|
||||
// check for those.
|
||||
|
||||
@@ -102,9 +102,9 @@ public final class IMCHandler {
|
||||
PatternBuilder.instance.registerFullMaterial(
|
||||
item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID);
|
||||
|
||||
List<Item> addItems = new LinkedList<Item>();
|
||||
List<Integer> addMetas = new LinkedList<Integer>();
|
||||
List<ItemStack> addOUtputs = new LinkedList<ItemStack>();
|
||||
List<Item> addItems = new LinkedList<>();
|
||||
List<Integer> addMetas = new LinkedList<>();
|
||||
List<ItemStack> addOUtputs = new LinkedList<>();
|
||||
|
||||
// add mappings for everything that has stone tool mappings
|
||||
for (Map.Entry<List, ItemStack> mappingEntry : TConstructRegistry.patternPartMapping.entrySet()) {
|
||||
@@ -161,7 +161,7 @@ public final class IMCHandler {
|
||||
}
|
||||
|
||||
// we add the toolpart to all smeltery recipies that use iron and create a toolpart
|
||||
List<CastingRecipe> newRecipies = new LinkedList<CastingRecipe>();
|
||||
List<CastingRecipe> newRecipies = new LinkedList<>();
|
||||
for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) {
|
||||
if (recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) continue;
|
||||
if (recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) continue;
|
||||
|
||||
@@ -7,8 +7,8 @@ import net.minecraftforge.common.config.Configuration;
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
public class DimensionBlacklist {
|
||||
public static ArrayList<Integer> blacklistedDims = new ArrayList<Integer>();
|
||||
public static ArrayList<Integer> noPoolDims = new ArrayList<Integer>();
|
||||
public static ArrayList<Integer> blacklistedDims = new ArrayList<>();
|
||||
public static ArrayList<Integer> noPoolDims = new ArrayList<>();
|
||||
|
||||
public static int promisedLandDimensionID = -100;
|
||||
public static int twilightForestDimensionID = -100;
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraft.network.*;
|
||||
public class PacketPipeline extends MessageToMessageCodec<FMLProxyPacket, AbstractPacket> {
|
||||
|
||||
private EnumMap<Side, FMLEmbeddedChannel> channels;
|
||||
private LinkedList<Class<? extends AbstractPacket>> packets = new LinkedList<Class<? extends AbstractPacket>>();
|
||||
private LinkedList<Class<? extends AbstractPacket>> packets = new LinkedList<>();
|
||||
private boolean isPostInitialised = false;
|
||||
|
||||
/**
|
||||
|
||||
@@ -61,7 +61,7 @@ public class WeaponryClientProxy extends WeaponryCommonProxy {
|
||||
}
|
||||
|
||||
private void registerEntityRendering() {
|
||||
ProjectileBaseRenderer defaultRenderer = new ProjectileBaseRenderer<ProjectileBase>();
|
||||
ProjectileBaseRenderer defaultRenderer = new ProjectileBaseRenderer<>();
|
||||
RenderingRegistry.registerEntityRenderingHandler(ShurikenEntity.class, new ShurikenEntityRenderer());
|
||||
RenderingRegistry.registerEntityRenderingHandler(ThrowingKnifeEntity.class, defaultRenderer);
|
||||
RenderingRegistry.registerEntityRenderingHandler(JavelinEntity.class, new JavelinEntityRenderer());
|
||||
|
||||
@@ -990,7 +990,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
|
||||
* break; case 2: items.add(new ItemStack(Block.stoneOvenIdle)); break;
|
||||
* } return items;
|
||||
*/
|
||||
return new ArrayList<ItemStack>();
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,7 +12,7 @@ import tconstruct.world.TinkerWorld;
|
||||
|
||||
public class TVillageTrades implements IVillageTradeHandler {
|
||||
|
||||
private final List<ItemStack> allowedIngredients = new ArrayList<ItemStack>();
|
||||
private final List<ItemStack> allowedIngredients = new ArrayList<>();
|
||||
private final int max = 17;
|
||||
private final int min = 7;
|
||||
|
||||
|
||||
Reference in new issue
Block a user