exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 05:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.9

Browse Source
This commit is contained in:
Daniel Saukel
2016-03-21 20:35:12 +01:00
parent 08a025fff6
commit 7a514d5378
8 changed files with 886 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+92 -124
View File
@@ -1,143 +1,111 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.dre</groupId> <groupId>com.dre</groupId>
<artifactId>brewery</artifactId> <artifactId>brewery</artifactId>
<version>1.3.2</version> <version>1.4-SNAPSHOT</version>
<name>Brewery</name> <name>Brewery</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<resources> <resources>
<!-- Static resources --> <!-- Static resources -->
<resource> <resource>
<filtering>false</filtering> <filtering>false</filtering>
<directory>${project.basedir}/resources</directory> <directory>${project.basedir}/resources</directory>
<includes> <includes>
<include>**/*.yml</include> <include>**/*.yml</include>
</includes> </includes>
<excludes> <excludes>
<exclude>target/**</exclude> <exclude>target/**</exclude>
<exclude>.travis.yml</exclude> <exclude>.travis.yml</exclude>
</excludes> </excludes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.7</source>
<target>1.6</target> <target>1.7</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository> <repository>
<id>vault-repo</id> <id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url> <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
</repository> </repository>
<repository>
<id>dre2n-repo</id>
<url>http://feuerstern.bplaced.net/repo/</url>
</repository>
<repository>
<id>sk89q-repo</id>
<url>http://maven.sk89q.com/artifactory/repo/</url>
</repository>
<repository>
<id>addstar-repo</id>
<url>http://maven.addstar.com.au/artifactory/ext-release-local/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repository>
<id>md_5-releases</id>
<url>http://repo.md-5.net/content/repositories/releases/</url>
</repository>
</repositories>
<repository> <dependencies>
<id>sk89q-repo</id> <dependency>
<url>http://maven.sk89q.com/artifactory/repo/</url> <groupId>org.bukkit</groupId>
<snapshots> <artifactId>bukkit</artifactId>
<enabled>true</enabled> <version>1.9-R0.1-SNAPSHOT</version>
<updatePolicy>always</updatePolicy> </dependency>
</snapshots>
</repository>
<repository>
<id>dre-repo</id>
<url>http://server.die-reiche-erethons.com/maven2</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repository>
<id>addstar-repo</id>
<url>http://maven.addstar.com.au/artifactory/ext-release-local/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<dependencies>
<!-- Provided by third-party -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>net.milkbowl.vault</groupId> <groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId> <artifactId>VaultAPI</artifactId>
<version>1.5</version> <version>1.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<dependency> <groupId>com.sk89q</groupId>
<groupId>com.sk89q</groupId> <artifactId>worldguard</artifactId>
<artifactId>worldguard</artifactId> <version>6.1</version>
<version>6.0.0-SNAPSHOT</version> </dependency>
</dependency> <dependency>
<groupId>com.griefcraft</groupId>
<dependency> <artifactId>entitylwc</artifactId>
<groupId>com.dre</groupId> <version>1.7.2</version>
<artifactId>managerxl</artifactId> </dependency>
<version>0.0.1-SNAPSHOT</version> <dependency>
<scope>compile</scope> <groupId>me.ryanhamshire</groupId>
<type>jar</type> <artifactId>GriefPrevention</artifactId>
</dependency> <version>13.9.1</version>
<scope>compile</scope>
<dependency> </dependency>
<groupId>com.griefcraft</groupId> <dependency>
<artifactId>lwc</artifactId> <groupId>de.diddiz</groupId>
<version>4.4.0</version> <artifactId>logblock</artifactId>
<scope>compile</scope> <version>1.94</version>
<type>jar</type> </dependency>
</dependency> </dependencies>
<dependency>
<groupId>me.ryanhamshire</groupId>
<artifactId>griefprevention</artifactId>
<version>7.8</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>de.diddiz.LogBlock</groupId>
<artifactId>LogBlock</artifactId>
<version>1.80</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
</dependencies>
</project> </project>
resources/plugin.yml
+1 -1
View File
@@ -1,5 +1,5 @@
name: Brewery name: Brewery
version: 1.3.2 version: 1.4-SNAPSHOT
main: com.dre.brewery.P main: com.dre.brewery.P
authors: [Milan Albrecht, Frank Baumann] authors: [Milan Albrecht, Frank Baumann]
softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention, Vault] softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention, Vault]
src/com/dre/brewery/BIngredients.java
+23 -8
View File
@@ -1,16 +1,15 @@
package com.dre.brewery; package com.dre.brewery;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.HashMap;
import java.util.Set; import java.util.Set;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Material;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionEffectType;
public class BIngredients { public class BIngredients {
public static Set<Material> possibleIngredients = new HashSet<Material>(); public static Set<Material> possibleIngredients = new HashSet<Material>();
@@ -84,7 +83,11 @@ public class BIngredients {
Brew.addOrReplaceEffects(potionMeta, brew.getEffects(), brew.getQuality()); Brew.addOrReplaceEffects(potionMeta, brew.getEffects(), brew.getQuality());
cookedName = cookRecipe.getName(quality); cookedName = cookRecipe.getName(quality);
potion.setDurability(Brew.PotionColor.valueOf(cookRecipe.getColor()).getColorId(false)); if (P.use1_9) {
potionMeta.setMainEffect(Brew.PotionColor.valueOf(cookRecipe.getColor()).getEffect());
} else {
potion.setDurability(Brew.PotionColor.valueOf(cookRecipe.getColor()).getColorId(false));
}
} else { } else {
// new base potion // new base potion
@@ -92,14 +95,22 @@ public class BIngredients {
if (state <= 1) { if (state <= 1) {
cookedName = P.p.languageReader.get("Brew_ThickBrew"); cookedName = P.p.languageReader.get("Brew_ThickBrew");
potion.setDurability(Brew.PotionColor.BLUE.getColorId(false)); if (P.use1_9) {
potionMeta.setMainEffect(Brew.PotionColor.BLUE.getEffect());
} else {
potion.setDurability(Brew.PotionColor.BLUE.getColorId(false));
}
} else { } else {
for (Material ingredient : materials.keySet()) { for (Material ingredient : materials.keySet()) {
if (cookedNames.containsKey(ingredient)) { if (cookedNames.containsKey(ingredient)) {
// if more than half of the ingredients is of one kind // if more than half of the ingredients is of one kind
if (materials.get(ingredient) > (getIngredientsCount() / 2)) { if (materials.get(ingredient) > (getIngredientsCount() / 2)) {
cookedName = cookedNames.get(ingredient); cookedName = cookedNames.get(ingredient);
potion.setDurability(Brew.PotionColor.CYAN.getColorId(true)); if (P.use1_9) {
potionMeta.setMainEffect(Brew.PotionColor.CYAN.getEffect());
} else {
potion.setDurability(Brew.PotionColor.CYAN.getColorId(true));
}
} }
} }
} }
@@ -108,7 +119,11 @@ public class BIngredients {
if (cookedName == null) { if (cookedName == null) {
// if no name could be found // if no name could be found
cookedName = P.p.languageReader.get("Brew_Undefined"); cookedName = P.p.languageReader.get("Brew_Undefined");
potion.setDurability(Brew.PotionColor.CYAN.getColorId(true)); if (P.use1_9) {
potionMeta.setMainEffect(Brew.PotionColor.CYAN.getEffect());
} else {
potion.setDurability(Brew.PotionColor.CYAN.getColorId(true));
}
} }
potionMeta.setDisplayName(P.p.color("&f" + cookedName)); potionMeta.setDisplayName(P.p.color("&f" + cookedName));
src/com/dre/brewery/BPlayer.java
+7 -12
View File
@@ -1,22 +1,21 @@
package com.dre.brewery; package com.dre.brewery;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Material;
import org.bukkit.util.Vector;
import org.bukkit.Location;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.util.Vector;
public class BPlayer { public class BPlayer {
private static Map<String, BPlayer> players = new HashMap<String, BPlayer>();// Players name/uuid and BPlayer private static Map<String, BPlayer> players = new HashMap<String, BPlayer>();// Players name/uuid and BPlayer
@@ -339,10 +338,6 @@ public class BPlayer {
Location home = null; Location home = null;
if (homeType.equalsIgnoreCase("bed")) { if (homeType.equalsIgnoreCase("bed")) {
home = player.getBedSpawnLocation(); home = player.getBedSpawnLocation();
} else if (homeType.equalsIgnoreCase("ManagerXL")) {
if (com.dre.managerxl.MPlayer.get(player.getName()) != null) {
home = com.dre.managerxl.MPlayer.get(player.getName()).getHome();
}
} else if (homeType.startsWith("cmd: ")) { } else if (homeType.startsWith("cmd: ")) {
player.performCommand(homeType.substring(5)); player.performCommand(homeType.substring(5));
} else if (homeType.startsWith("cmd:")) { } else if (homeType.startsWith("cmd:")) {
src/com/dre/brewery/BRecipe.java
+6 -3
View File
@@ -2,9 +2,8 @@ package com.dre.brewery;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@@ -205,7 +204,11 @@ public class BRecipe {
Brew brew = new Brew(uid, bIngredients, quality, distillruns, getAge(), wood, getName(5), false, false, true); Brew brew = new Brew(uid, bIngredients, quality, distillruns, getAge(), wood, getName(5), false, false, true);
potion.setDurability(Brew.PotionColor.valueOf(getColor()).getColorId(false)); if (P.use1_9) {
potionMeta.setMainEffect(Brew.PotionColor.valueOf(getColor()).getEffect());
} else {
potion.setDurability(Brew.PotionColor.valueOf(getColor()).getColorId(false));
}
potionMeta.setDisplayName(P.p.color("&f" + getName(quality))); potionMeta.setDisplayName(P.p.color("&f" + getName(quality)));
// This effect stores the UID in its Duration // This effect stores the UID in its Duration
potionMeta.addCustomEffect((PotionEffectType.REGENERATION).createEffect((uid * 4), 0), true); potionMeta.addCustomEffect((PotionEffectType.REGENERATION).createEffect((uid * 4), 0), true);
src/com/dre/brewery/Brew.java
+686 -664
View File
File diff suppressed because it is too large Load Diff
src/com/dre/brewery/P.java
+40 -32
View File
@@ -1,46 +1,44 @@
package com.dre.brewery; package com.dre.brewery;
import java.io.FileOutputStream; import com.dre.brewery.filedata.*;
import java.io.InputStream; import com.dre.brewery.integration.LogBlockBarrel;
import java.io.OutputStream;
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.HashMap;
import java.io.IOException;
import java.io.File;
import java.util.UUID;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.ConfigurationSection;
import com.dre.brewery.integration.WGBarrel; import com.dre.brewery.integration.WGBarrel;
import com.dre.brewery.integration.WGBarrelNew; import com.dre.brewery.integration.WGBarrelNew;
import com.dre.brewery.integration.WGBarrelOld; import com.dre.brewery.integration.WGBarrelOld;
import org.apache.commons.lang.math.NumberUtils;
import org.bukkit.event.HandlerList;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import com.dre.brewery.listeners.*; import com.dre.brewery.listeners.*;
import com.dre.brewery.filedata.*; import java.io.File;
import com.dre.brewery.integration.LogBlockBarrel; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang.math.NumberUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
public class P extends JavaPlugin { public class P extends JavaPlugin {
public static P p; public static P p;
public static String configVersion = "1.3.1"; public static String configVersion = "1.3.1";
public static boolean debug; public static boolean debug;
public static boolean useUUID; public static boolean useUUID;
public static boolean use1_9;
public static boolean updateCheck; public static boolean updateCheck;
// Third Party Enabled // Third Party Enabled
@@ -57,6 +55,7 @@ public class P extends JavaPlugin {
public EntityListener entityListener; public EntityListener entityListener;
public InventoryListener inventoryListener; public InventoryListener inventoryListener;
public WorldListener worldListener; public WorldListener worldListener;
public Compat1_9 compat1_9;
// Language // Language
public String language; public String language;
@@ -68,7 +67,12 @@ public class P extends JavaPlugin {
// Version check // Version check
String v = Bukkit.getBukkitVersion(); String v = Bukkit.getBukkitVersion();
useUUID = !v.matches(".*1\\.[1-6].*") && !v.matches(".*1\\.7\\.[0-5].*"); useUUID = !v.matches(".*1\\.[0-6].*") && !v.matches(".*1\\.7\\.[0-5].*");
use1_9 = !v.matches(".*1\\.[0-8].*");
if (use1_9) {
log("&cExperimental support for Bukkit 1.9 enabled.");
log("&cPlease note that the changes of 1.9 make a build of Brewery with the same quality as for older versions impossible.");
}
// load the Config // load the Config
try { try {
@@ -94,6 +98,7 @@ public class P extends JavaPlugin {
entityListener = new EntityListener(); entityListener = new EntityListener();
inventoryListener = new InventoryListener(); inventoryListener = new InventoryListener();
worldListener = new WorldListener(); worldListener = new WorldListener();
compat1_9 = new Compat1_9();
getCommand("Brewery").setExecutor(new CommandListener()); getCommand("Brewery").setExecutor(new CommandListener());
p.getServer().getPluginManager().registerEvents(blockListener, p); p.getServer().getPluginManager().registerEvents(blockListener, p);
@@ -101,6 +106,9 @@ public class P extends JavaPlugin {
p.getServer().getPluginManager().registerEvents(entityListener, p); p.getServer().getPluginManager().registerEvents(entityListener, p);
p.getServer().getPluginManager().registerEvents(inventoryListener, p); p.getServer().getPluginManager().registerEvents(inventoryListener, p);
p.getServer().getPluginManager().registerEvents(worldListener, p); p.getServer().getPluginManager().registerEvents(worldListener, p);
if (use1_9) {
p.getServer().getPluginManager().registerEvents(compat1_9, p);
}
// Heartbeat // Heartbeat
p.getServer().getScheduler().runTaskTimer(p, new BreweryRunnable(), 650, 1200); p.getServer().getScheduler().runTaskTimer(p, new BreweryRunnable(), 650, 1200);
src/com/dre/brewery/listeners/Compat1_9.java
+31
View File
@@ -0,0 +1,31 @@
package com.dre.brewery.listeners;
import com.dre.brewery.Brew;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
// Workaround to remove unwanted potion effects
public class Compat1_9 implements Listener {
@EventHandler
public void onPlayerDrink(PlayerItemConsumeEvent event) {
ItemStack item = event.getItem();
Brew brew = Brew.get(item);
if (brew == null) {
return;
}
if (item.getType() == Material.POTION) {
try {
PotionMeta meta = (PotionMeta) item.getItemMeta();
meta.setMainEffect(null);
item.setItemMeta(meta);
} catch (Exception exception) {}
}
}
}