Skip to content

1.9 update #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrkMatr1984 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

1.9 update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba1cb7
Add 1.9 module
DrkMatr1984 Apr 21, 2016
e24070d
Update README.md
DrkMatr1984 Apr 21, 2016
56ea899
Updates for 1.9.4 and 1.10
DrkMatr1984 Jun 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ All CraftBukkit & Spigot releases for:
* 1.8.4
* 1.8.7
* 1.8.8

Known Bgs
----------
* ~~The XP removal system does not function as expected - XP still drops from breeding animals.~~
* 1.9
* 1.9.2

To do
----------
Expand Down
32 changes: 30 additions & 2 deletions WildSex/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@
<artifactId>wildsex</artifactId>
<packaging>jar</packaging>
<name>WildSex</name>
<version>3.2</version>
<version>3.6</version>
<!-- This is where I track the version -->

<repositories>
<repository>
<id>Another-Spigot-repo</id>
<url>http://maven.elmakers.com/repository/</url>
</repository>
<repository>
<id>repo</id>
<url>http://73.64.253.11/repo/</url>
</repository>
</repositories>

<dependencies>
Expand Down Expand Up @@ -56,6 +60,30 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_9_R1</artifactId>
<version>v1_9_R1</version>
<type>jar</type>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_9_R2</artifactId>
<version>v1_9_R2</version>
<type>jar</type>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_10_R1</artifactId>
<version>v1_10_R1</version>
<type>jar</type>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-api</artifactId>
Expand All @@ -75,7 +103,7 @@
<dependency>
<groupId>com.bergerkiller.bukkit</groupId>
<artifactId>BKCommonLib</artifactId>
<version>1.67-SNAPSHOT</version>
<version>1.70-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
<optional>true</optional>
Expand Down
14 changes: 8 additions & 6 deletions WildSex/src/main/java/com/cemgokmen/wildsex/WildSexTaskListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ public void onEntityAddEvent(EntityAddEvent event) {
double dist = 0.0;
for (Entity e : plugin.getMatedAnimals()) {
Location l = e.getLocation();
double distance = l.distance(orbLocation);
if (distance < MAX_DISTANCE) {
isFromMatedAnimal = true;
dist = distance;
break;
}
if(l.getWorld().equals(orbLocation.getWorld())){
double distance = l.distance(orbLocation);
if (distance < MAX_DISTANCE) {
isFromMatedAnimal = true;
dist = distance;
break;
}
}
}
if (isFromMatedAnimal) {
orb.remove();
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<module>v1_8_R1</module>
<module>v1_8_R2</module>
<module>v1_8_R3</module>
<module>v1_9_R1</module>
<module>v1_9_R2</module>
<module>v1_10_R1</module>
<module>WildSex</module>
</modules>

Expand Down
26 changes: 26 additions & 0 deletions v1_10_R1/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
38 changes: 38 additions & 0 deletions v1_10_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_10_R1</artifactId>
<packaging>jar</packaging>
<name>WildSex implementation v1_10_R1</name>
<version>v1_10_R1</version>

<parent>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-parent</artifactId>
<version>parent</version>
</parent>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-api</artifactId> <!-- Depend on the API! -->
<version>API</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
35 changes: 35 additions & 0 deletions v1_10_R1/src/main/java/com/cemgokmen/wildsex/wildanimal/v1_10_R1/WildAnimalHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.cemgokmen.wildsex.wildanimal.v1_10_R1;

import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftAnimals;
import net.minecraft.server.v1_10_R1.EntityAnimal;
import net.minecraft.server.v1_10_R1.EntityHuman;

import org.bukkit.entity.Animals;

import com.cemgokmen.wildsex.api.WildAnimal;

public class WildAnimalHandler implements WildAnimal {
private EntityAnimal getEntityAnimal(Animals animal) {
EntityAnimal entity = (EntityAnimal) ((CraftEntity) ((CraftAnimals) animal)).getHandle();
return entity;
}

@Override
public boolean isInLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
return entity.isInLove();
}

public void startLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
EntityHuman human = null;

entity.c(human);
}

public void endLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
entity.resetLove();
}
}
26 changes: 26 additions & 0 deletions v1_9_R1/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
38 changes: 38 additions & 0 deletions v1_9_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_9_R1</artifactId>
<packaging>jar</packaging>
<name>WildSex implementation v1_9_R1</name>
<version>v1_9_R1</version>

<parent>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-parent</artifactId>
<version>parent</version>
</parent>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.9.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-api</artifactId> <!-- Depend on the API! -->
<version>API</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
35 changes: 35 additions & 0 deletions v1_9_R1/src/main/java/com/cemgokmen/wildsex/wildanimal/v1_9_R1/WildAnimalHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.cemgokmen.wildsex.wildanimal.v1_9_R1;

import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftAnimals;
import net.minecraft.server.v1_9_R1.EntityAnimal;
import net.minecraft.server.v1_9_R1.EntityHuman;

import org.bukkit.entity.Animals;

import com.cemgokmen.wildsex.api.WildAnimal;

public class WildAnimalHandler implements WildAnimal {
private EntityAnimal getEntityAnimal(Animals animal) {
EntityAnimal entity = (EntityAnimal) ((CraftEntity) ((CraftAnimals) animal)).getHandle();
return entity;
}

@Override
public boolean isInLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
return entity.isInLove();
}

public void startLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
EntityHuman human = null;

entity.c(human);
}

public void endLoveMode(Animals animal) {
EntityAnimal entity = getEntityAnimal(animal);
entity.resetLove();
}
}
26 changes: 26 additions & 0 deletions v1_9_R2/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
38 changes: 38 additions & 0 deletions v1_9_R2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-v1_9_R2</artifactId>
<packaging>jar</packaging>
<name>WildSex implementation v1_9_R2</name>
<version>v1_9_R2</version>

<parent>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-parent</artifactId>
<version>parent</version>
</parent>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.cemgokmen</groupId>
<artifactId>wildsex-api</artifactId> <!-- Depend on the API! -->
<version>API</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
Loading