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

Slight adjustment to Sataniel's fixes to preserve tab-based indentation for easy merge compare.

Browse Source
This commit is contained in:
ProgrammerDan
2016-04-18 18:15:30 -04:00
parent ddaa2bdbfc
commit 2d0d059008
5 changed files with 779 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+16
View File
@@ -0,0 +1,16 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
[*.java]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
[*.yml]
indent_style = spaces
indent_size = 2
trim_trailing_whitespace = true
pom.xml
+102 -102
View File
@@ -1,111 +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.4-SNAPSHOT</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>2.5.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.7</source> <source>1.7</source>
<target>1.7</target> <target>1.7</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url> <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository> </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> <repository>
<id>dre2n-repo</id> <id>dre2n-repo</id>
<url>http://feuerstern.bplaced.net/repo/</url> <url>http://feuerstern.bplaced.net/repo/</url>
</repository> </repository>
<repository> <repository>
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>http://maven.sk89q.com/artifactory/repo/</url> <url>http://maven.sk89q.com/artifactory/repo/</url>
</repository> </repository>
<repository> <repository>
<id>addstar-repo</id> <id>addstar-repo</id>
<url>http://maven.addstar.com.au/artifactory/ext-release-local/</url> <url>http://maven.addstar.com.au/artifactory/ext-release-local/</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<updatePolicy>always</updatePolicy> <updatePolicy>always</updatePolicy>
</snapshots> </snapshots>
</repository> </repository>
<repository> <repository>
<id>md_5-releases</id> <id>md_5-releases</id>
<url>http://repo.md-5.net/content/repositories/releases/</url> <url>http://repo.md-5.net/content/repositories/releases/</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.9-R0.1-SNAPSHOT</version> <version>1.9-R0.1-SNAPSHOT</version>
</dependency> </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.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.griefcraft</groupId> <groupId>com.griefcraft</groupId>
<artifactId>entitylwc</artifactId> <artifactId>entitylwc</artifactId>
<version>1.7.2</version> <version>1.7.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.ryanhamshire</groupId> <groupId>me.ryanhamshire</groupId>
<artifactId>GriefPrevention</artifactId> <artifactId>GriefPrevention</artifactId>
<version>13.9.1</version> <version>13.9.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.diddiz</groupId> <groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId> <artifactId>logblock</artifactId>
<version>1.94</version> <version>1.94</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
src/com/dre/brewery/Brew.java
+618 -618
View File
File diff suppressed because it is too large Load Diff
src/com/dre/brewery/integration/GriefPreventionBarrel.java
+28 -28
View File
@@ -9,39 +9,39 @@ import org.bukkit.entity.Player;
public class GriefPreventionBarrel { public class GriefPreventionBarrel {
static P brewery = P.p; static P brewery = P.p;
static GriefPrevention griefPrevention = GriefPrevention.instance; static GriefPrevention griefPrevention = GriefPrevention.instance;
public static boolean checkAccess(Player player, Block sign) { public static boolean checkAccess(Player player, Block sign) {
PlayerData playerData = griefPrevention.dataStore.getPlayerData(player.getUniqueId()); PlayerData playerData = griefPrevention.dataStore.getPlayerData(player.getUniqueId());
if (!griefPrevention.claimsEnabledForWorld(player.getWorld()) || playerData.ignoreClaims || !griefPrevention.config_claims_preventTheft) { if (!griefPrevention.claimsEnabledForWorld(player.getWorld()) || playerData.ignoreClaims || !griefPrevention.config_claims_preventTheft) {
return true; return true;
} }
// block container use during pvp combat // block container use during pvp combat
if (playerData.inPvpCombat()) { if (playerData.inPvpCombat()) {
brewery.msg(player, brewery.languageReader.get("Error_NoBarrelAccess")); brewery.msg(player, brewery.languageReader.get("Error_NoBarrelAccess"));
return false; return false;
} }
// check permissions for the claim the Barrel is in // check permissions for the claim the Barrel is in
Claim claim = griefPrevention.dataStore.getClaimAt(sign.getLocation(), false, playerData.lastClaim); Claim claim = griefPrevention.dataStore.getClaimAt(sign.getLocation(), false, playerData.lastClaim);
if (claim != null) { if (claim != null) {
playerData.lastClaim = claim; playerData.lastClaim = claim;
String noContainersReason = claim.allowContainers(player); String noContainersReason = claim.allowContainers(player);
if (noContainersReason != null) { if (noContainersReason != null) {
brewery.msg(player, brewery.languageReader.get("Error_NoBarrelAccess")); brewery.msg(player, brewery.languageReader.get("Error_NoBarrelAccess"));
return false; return false;
} }
} }
// drop any pvp protection, as the player opens a barrel // drop any pvp protection, as the player opens a barrel
if (playerData.pvpImmune) { if (playerData.pvpImmune) {
playerData.pvpImmune = false; playerData.pvpImmune = false;
} }
return true; return true;
} }
} }
src/com/dre/brewery/listeners/Compat1_9.java
+15 -15
View File
@@ -11,21 +11,21 @@ import org.bukkit.inventory.meta.PotionMeta;
// Workaround to remove unwanted potion effects // Workaround to remove unwanted potion effects
public class Compat1_9 implements Listener { public class Compat1_9 implements Listener {
@EventHandler @EventHandler
public void onPlayerDrink(PlayerItemConsumeEvent event) { public void onPlayerDrink(PlayerItemConsumeEvent event) {
ItemStack item = event.getItem(); ItemStack item = event.getItem();
Brew brew = Brew.get(item); Brew brew = Brew.get(item);
if (brew == null) { if (brew == null) {
return; return;
} }
if (item.getType() == Material.POTION) { if (item.getType() == Material.POTION) {
try { try {
PotionMeta meta = (PotionMeta) item.getItemMeta(); PotionMeta meta = (PotionMeta) item.getItemMeta();
meta.setMainEffect(null); meta.setMainEffect(null);
item.setItemMeta(meta); item.setItemMeta(meta);
} catch (Exception exception) {} } catch (Exception exception) {}
} }
} }
} }