From 48918cdc81e4e3749a96fc91e8b72e4310f7e8d2 Mon Sep 17 00:00:00 2001 From: Miguel Astor Date: Mon, 13 Oct 2014 09:45:16 -0430 Subject: [PATCH] Changed license to 2-clause BSD. Removed boilerplate from states. --- LICENSE | 218 ++---------------- .../poukemon/android/AndroidLauncher.java | 15 ++ build.gradle | 2 +- .../gamejolt/mikykr5/poukemon/GameCore.java | 20 +- .../mikykr5/poukemon/ProjectConstants.java | 20 +- .../poukemon/effects/ScrollingBackground.java | 20 +- .../interfaces/AssetsLoadedListener.java | 20 +- .../mikykr5/poukemon/states/BaseState.java | 28 ++- .../mikykr5/poukemon/states/InGameState.java | 36 +++ .../mikykr5/poukemon/states/LoadingState.java | 29 +-- .../poukemon/states/LogoScreenState.java | 29 +-- .../poukemon/states/MainMenuState.java | 28 +-- .../poukemon/utils/AsyncAssetLoader.java | 20 +- .../poukemon/utils/CachedFontManager.java | 20 +- .../poukemon/desktop/DesktopLauncher.java | 20 +- 15 files changed, 192 insertions(+), 333 deletions(-) create mode 100644 core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java diff --git a/LICENSE b/LICENSE index d645695..7214200 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,22 @@ +Copyright (c) 2014, Miguel Angel Astor Romero +All rights reserved. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java b/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java index 83b05ad..0961b72 100644 --- a/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java +++ b/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Read the LICENSE file for more details. + */ package com.gamejolt.mikykr5.poukemon.android; import android.os.Bundle; diff --git a/build.gradle b/build.gradle index 4267dce..87099f0 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ allprojects { version = '1.0' ext { appName = 'PouKemon' - gdxVersion = '1.3.1' + gdxVersion = '1.4.1' roboVMVersion = '0.0.14' } diff --git a/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java b/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java index 6a8c658..cf13de1 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java b/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java index ea6caa6..619240e 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java b/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java index 5698e71..eacb2d6 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.effects; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java b/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java index 3152725..3f7bd9a 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.interfaces; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java b/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java index dcf1c40..1eda7b3 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.states; @@ -24,13 +24,19 @@ import com.badlogic.gdx.math.Vector3; import com.gamejolt.mikykr5.poukemon.GameCore; public abstract class BaseState implements Screen, InputProcessor{ + private static final String CLASS_NAME = BaseState.class.getSimpleName(); + protected GameCore core; protected boolean stateEnabled; protected OrthographicCamera pixelPerfectCamera; protected Vector3 win2world; protected Vector2 touchPointWorldCoords; - public BaseState(){ + public BaseState(final GameCore core) throws IllegalArgumentException{ + if(core == null) + throw new IllegalArgumentException(CLASS_NAME + ": Core is null."); + + this.core = core; this.pixelPerfectCamera = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); win2world = new Vector3(0.0f, 0.0f, 0.0f); touchPointWorldCoords = new Vector2(); diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java b/core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java new file mode 100644 index 0000000..f6ef53e --- /dev/null +++ b/core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Read the LICENSE file for more details. + */ +package com.gamejolt.mikykr5.poukemon.states; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.GL20; +import com.gamejolt.mikykr5.poukemon.GameCore; + +public class InGameState extends BaseState { + public InGameState(final GameCore core) throws IllegalArgumentException { + super(core); + } + + @Override + public void render(float delta) { + Gdx.gl.glClearColor(0, 0, 0, 1); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + } + + @Override + public void dispose() { + } +} diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java b/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java index 88205e3..5ed29a3 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.states; @@ -27,8 +27,6 @@ import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; import com.gamejolt.mikykr5.poukemon.utils.CachedFontManager; public class LoadingState extends BaseState{ - private static final String CLASS_NAME = MainMenuState.class.getSimpleName(); - // Helper fields. private AsyncAssetLoader loader; private CachedFontManager fontManager; @@ -40,16 +38,11 @@ public class LoadingState extends BaseState{ private ScrollingBackground scrollingBckg; public LoadingState(final GameCore core) throws IllegalArgumentException{ - super(); + super(core); loader = AsyncAssetLoader.getInstance(); fontManager = CachedFontManager.getInstance(); - if(core == null) - throw new IllegalArgumentException(CLASS_NAME + ": Core is null."); - - this.core = core; - // Create the start button font. font = fontManager.loadFont("data/fonts/Big_Bottom_Cartoon.ttf", CachedFontManager.BASE_FONT_SIZE * 3); diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java b/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java index 65887e6..20beacf 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.states; @@ -22,17 +22,12 @@ import com.gamejolt.mikykr5.poukemon.GameCore; import com.gamejolt.mikykr5.poukemon.GameCore.game_states_t; public class LogoScreenState extends BaseState{ - private static final String CLASS_NAME = LogoScreenState.class.getSimpleName(); private Texture logo; private long then; - public LogoScreenState(final GameCore core){ - if(core == null) - throw new IllegalArgumentException(CLASS_NAME + ": Core is null."); - - this.core = core; + public LogoScreenState(final GameCore core) throws IllegalArgumentException{ + super(core); then = System.currentTimeMillis(); - logo = new Texture(Gdx.files.internal("data/gfx/textures/monkey.png")); } diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java b/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java index 695894d..3142767 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.states; @@ -35,8 +35,6 @@ import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; import com.gamejolt.mikykr5.poukemon.utils.CachedFontManager; public class MainMenuState extends BaseState implements AssetsLoadedListener{ - private static final String CLASS_NAME = MainMenuState.class.getSimpleName(); - // Helper fields. private AsyncAssetLoader loader; private CachedFontManager fontManager; @@ -63,12 +61,8 @@ public class MainMenuState extends BaseState implements AssetsLoadedListener{ private int quitButtonTouchPointer; public MainMenuState(final GameCore core) throws IllegalArgumentException{ - super(); + super(core); - if(core == null) - throw new IllegalArgumentException(CLASS_NAME + ": Core is null."); - - this.core = core; loader = AsyncAssetLoader.getInstance(); fontManager = CachedFontManager.getInstance(); assetsLoaded = false; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java b/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java index e224d91..abbf9f3 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.utils; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/utils/CachedFontManager.java b/core/src/com/gamejolt/mikykr5/poukemon/utils/CachedFontManager.java index 9e4c902..a2b701e 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/utils/CachedFontManager.java +++ b/core/src/com/gamejolt/mikykr5/poukemon/utils/CachedFontManager.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.utils; diff --git a/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java b/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java index d51d5e5..2e5a2e9 100644 --- a/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java +++ b/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2014 Miguel Angel Astor Romero + * Copyright (c) 2014, Miguel Angel Astor Romero + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.apache.org/licenses/LICENSE-2.0 + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Read the LICENSE file for more details. */ package com.gamejolt.mikykr5.poukemon.desktop;