Skip to content
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.

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

Update BukkitFullOfMoon on 1.8.6 and change block Sponge by Enderstone #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 0 additions & 38 deletions build.xml

This file was deleted.

105 changes: 77 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,79 @@
<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>org.bukkit</groupId>
<artifactId>bukkit-moon</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>BukkitFullOfMoon</name>
<url>http://www.bukkit.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
<?xml version="1.0" encoding="UTF-8"?>
<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>org.bukkit</groupId>
<artifactId>bukkit-moon</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>BukkitFullOfMoon</name>
<url>http://www.bukkit.org</url>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8.6-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencies>

<scm>
<connection>scm:git:[email protected]:Dinnerbone/BukkitFullOfMoon.git</connection>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>dd-MM-yyyy</maven.build.timestamp.format>
</properties>

<build>
<defaultGoal>clean package</defaultGoal>
<finalName>${project.name}</finalName>
<resources>
<resource>
<directory>./src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<shortRevisionLength>6</shortRevisionLength>
<timestampFormat>{0, date,yyyyMMdd_HHmm}</timestampFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
3 changes: 2 additions & 1 deletion src/main/java/com/dinnerbone/bukkit/moon/BukkitMoon.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.WorldCreator;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.generator.ChunkGenerator;
Expand Down Expand Up @@ -35,7 +36,7 @@ public boolean anonymousCheck(CommandSender sender) {

public static World getMoon() {
if (moon == null) {
moon = Bukkit.getServer().createWorld(WORLD_NAME, World.Environment.NORMAL, new MoonChunkGenerator());
moon = Bukkit.getServer().createWorld(WorldCreator.name(WORLD_NAME).generator(new MoonChunkGenerator()).environment(World.Environment.NORMAL));
}

return moon;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void populate(World world, Random random, Chunk source) {
top.setType(Material.FENCE);
}

Block signBlock = top.getFace(direction);
Block signBlock = top.getRelative(direction);
signBlock.setType(Material.WALL_SIGN);
BlockState state = signBlock.getState();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public byte[] generate(World world, Random random, int cx, int cz) {
for (int z = 0; z < 16; z++) {
int height = getHeight(world, cx + x * 0.0625, cz + z * 0.0625, 2) + 60;
for (int y = 0; y < height; y++) {
result[(x * 16 + z) * 128 + y] = (byte)Material.SPONGE.getId();
result[(x * 16 + z) * 128 + y] = (byte)Material.ENDER_STONE.getId();
}
}
}
Expand Down