Skip to content

Commit

Permalink
Spout -> Flow
Browse files Browse the repository at this point in the history
  • Loading branch information
@kitskub
kitskub committed Jan 20, 2014
1 parent 7ea1c37 commit 70d81d3
Show file tree
Hide file tree
Showing 227 changed files with 4,783 additions and 4,250 deletions.
21 changes: 21 additions & 0 deletions HEADER.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
This file is part of ${project}, licensed under the MIT License (MIT).

Copyright (c) ${year} ${name} <${url}/>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
19 changes: 19 additions & 0 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
The MIT License (MIT)

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
179 changes: 166 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,84 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>Flow Engine</name>
<groupId>com.flowpowered</groupId>
<artifactId>flow-engine</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<inceptionYear>2013</inceptionYear>
<url>http://flowpowered.com</url>
<description>A voxel engine written in Java.</description>

<name>Flow Engine</name>
<url>http://maven.apache.org</url>
<!-- Parent information -->
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<!-- Build properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<buildNumber>0</buildNumber>
<ciSystem>unknown</ciSystem>
<commit>unknown</commit>
<mainClass>com.flowpowered.engine.SpoutApplication</mainClass>
</properties>

<!-- License information -->
<licenses>
<license>
<name>MIT License</name>
<url>http://www.tldrlegal.com/license/mit-license</url>
<distribution>repo</distribution>
</license>
</licenses>

<!-- Organization information -->
<organization>
<name>Spout LLC</name>
<url>http://www.spout.org</url>
</organization>

<!-- Project developers -->
<developers>
<developer>
<id>kitskub</id>
<name>Jack Huey</name>
<email>[email protected]</email>
</developer>
<developer>
<id>Wolf480pl</id>
<name>Wolf480pl</name>
<email>[email protected]</email>
</developer>
<developer>
<id>Wulfspider</id>
<name>Luke Spragg</name>
<email>[email protected]</email>
</developer>
</developers>

<!-- Source code access -->
<scm>
<connection>scm:git:git://github.com/flow/flow-engine.git</connection>
<developerConnection>scm:git:ssh://[email protected]:flow/flow-engine.git</developerConnection>
<url>https://github.com/flow/flow-engine</url>
</scm>

<!-- Continuous integration -->
<ciManagement>
<system>travis</system>
<url>https://travis-ci.org/flow/flow-engine</url>
</ciManagement>

<!-- Issue management -->
<issueManagement>
<system>github</system>
<url>https://github.com/flow/flow-engine/issues</url>
</issueManagement>

<!-- Dependency repositories -->
<repositories>
<repository>
Expand All @@ -28,15 +94,23 @@
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repository>
<id>4thline-cling</id>
<url>http://4thline.org/m2</url>
</repositories>

<!-- Build plugin repositories -->
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-releases</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
Expand Down Expand Up @@ -128,15 +202,74 @@

<!-- Build configuration -->
<build>
<defaultGoal>clean install</defaultGoal>

<!-- Resources to include -->
<resources>
<!-- Static resources -->
<resource>
<filtering>false</filtering>
<directory>.</directory>
<targetPath>.</targetPath>
<includes>
<include>LICENSE.txt</include>
</includes>
</resource>
</resources>

<!-- Build plugins -->
<plugins>
<!-- License header plugin -->
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.10.b1</version>
<executions>
<execution>
<configuration>
<properties>
<project>${project.name}</project>
<year>${project.inceptionYear}</year>
<name>${project.organization.name}</name>
<url>${project.organization.url}</url>
</properties>
<quiet>true</quiet>
<encoding>UTF-8</encoding>
<strictCheck>true</strictCheck>
<header>HEADER.txt</header>
<mapping>
<java>SLASHSTAR_STYLE</java>
</mapping>
<keywords>
<keyword>${project.name}</keyword>
<keyword>license</keyword>
</keywords>
<includes>
<include>src/main/java/**</include>
<include>src/test/java/**</include>
</includes>
</configuration>
<phase>clean</phase>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Source compiler plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<compilerArguments>
<O>-Xlint:all</O>
<O>-Xlint:-path</O>
</compilerArguments>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<!-- JAR creation plugin -->
Expand All @@ -147,11 +280,8 @@
<configuration>
<archive>
<manifestEntries>
<Main-Class>com.flowpowered.engine.SpoutApplication</Main-Class>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}+${ciSystem}-b${buildNumber}.git-${commit}</Implementation-Version>
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
<Specification-Title>${project.name} API</Specification-Title>
<Main-Class>${mainClass}}</Main-Class>
<Specification-Title>${project.name}</Specification-Title>
<Specification-Version>${project.version}+${ciSystem}-b${buildNumber}.git-${commit}</Specification-Version>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
</manifestEntries>
Expand All @@ -174,6 +304,7 @@
<executions>
<execution>
<configuration>
<minimizeJar>true</minimizeJar>
<filters>
<filter>
<artifact>*:*</artifact>
Expand All @@ -188,6 +319,12 @@
<exclude>**/*.java</exclude>
</excludes>
</filter>
<filter>
<artifact>com.flowpowered:*</artifact>
<includes>
<include>**</include>
</includes>
</filter>
</filters>
</configuration>
<phase>package</phase>
Expand All @@ -197,6 +334,22 @@
</execution>
</executions>
</plugin>
<!-- Coveralls reporting plugin -->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>2.1.0</version>
</plugin>
<!-- Cobertura test coverage plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
</configuration>
</plugin>
</plugins>
</build>
</project>
39 changes: 18 additions & 21 deletions src/main/java/com/flowpowered/api/Client.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
/*
* This file is part of Spout.
* This file is part of Flow Engine, licensed under the MIT License (MIT).
*
* Copyright (c) 2011 Spout LLC <http://www.spout.org/>
* Spout is licensed under the Spout License Version 1.
* Copyright (c) 2013 Spout LLC <http://www.spout.org/>
*
* Spout is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, either version 3 of the License, or (at your option)
* any later version.
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* In addition, 180 days after any changes are published, you can use the
* software, incorporating those changes, under the terms of the MIT license,
* as described in the Spout License Version 1.
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* Spout is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
* more details.
*
* You should have received a copy of the GNU Lesser General Public License,
* the MIT license and the Spout License Version 1 along with this program.
* If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
* License and see <http://spout.in/licensev1> for the full license, including
* the MIT license.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.flowpowered.api;

Expand All @@ -31,7 +28,7 @@
import com.flowpowered.api.render.Renderer;

/**
* Represents the client-specific component of the Spout platform.
* Represents the client-specific component of the Flow platform.
*/
public interface Client extends Engine {
/**
Expand Down
Loading

0 comments on commit 70d81d3

Please sign in to comment.