Skip to content

Commit

Permalink
POM Version updates & General fixes to resolve build
Browse files Browse the repository at this point in the history 
Swithed over to using TF-WorldEdit from Telesphoreo while we get the official repo up to date which also allowed some technical debt to be cleaned up. Fixed other build issues in the process.
  • Loading branch information
@Wild1145
Wild1145 committed Oct 14, 2018
1 parent cb2ddee commit 04c2287
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 23 deletions.
1 change: 0 additions & 1 deletion nb-configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.checkstyle.format>true</netbeans.checkstyle.format>
<netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
</properties>
</project-shared-configuration>
45 changes: 34 additions & 11 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,42 @@
</scm>

<repositories>
<repository>
<id>ess-repo</id>
<url>http://repo.ess3.net</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>

<repository>
<id>ess-repo</id>
<url>http://repo.ess3.net/content/groups/essentials</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<repository>
<id>sk89q-snapshots</id>
<url>http://maven.sk89q.com/artifactory/repo</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

Expand All @@ -83,7 +104,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12-pre5-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand All @@ -104,19 +125,21 @@
<artifactId>Essentials</artifactId>
<version>2.13.1</version>
</dependency>


<!-- The following have been changed to Telesphoreo's personal repo as it is the most stable current TF-WorldEdit build. These will be changed to a TotalFreedom build in the future -->

<dependency>
<groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
<groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>6.1.0-TF</version>
<version>7.0.0-TF-SNAPSHOT-R0.2</version>
</dependency>

<dependency>
<groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
<groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>

This comment has been minimized.

Sign in to view

Copy link
@Telesphoreo

Telesphoreo Oct 14, 2018

Contributor

You only need the bukkit one, not the core one

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Oct 14, 2018

Author Member

I believe, but will check, that the core one is where the custom changes are made? Unless the bukkit one wraps in the core one? Can't say as I am too familiar with how WorldEdit works in the details, but I think it was always two manual dependencies previously.

This comment has been minimized.

Sign in to view

Copy link
@Telesphoreo

Telesphoreo Oct 14, 2018

Contributor

No clue. I've always been compiling the bukkit one and it seems to recognize all the API methods and the imported classes

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Oct 14, 2018

Author Member

Interesting... I'll raise a ticket to do some investigation into it then... I don't want to import in more dependencies than we need to, but don't want to just shoot one in the head.

This comment has been minimized.

Sign in to view

Copy link
@JeromSar

JeromSar Oct 15, 2018 •
edited
Loading

Member

Why now use the TF-WorldEdit from Telesphoreo? Could we not fork/pull from Telesphoreo to gain controllability?

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Oct 15, 2018

Author Member

@JeromSar It's why I locked this to a particular release as a temporary measure. I intent to get the official TF-WorldEdit up and running, but this was breaking the entire build pipeline so for the time being this works quite well and removed tech debt elsewhere in TFM we were having to work with, but I do have an action on my to-do list to fix the main TFM build and then re-work this particular part of the POM dependency to establish if we need to declare both dependencies anyway, so it certainly won't be forgotten.

This comment has been minimized.

Sign in to view

Copy link
@JeromSar

JeromSar Oct 15, 2018

Member

Alright 👍

This comment has been minimized.

Sign in to view

Copy link
@Telesphoreo

Telesphoreo Oct 16, 2018

Contributor

Yeah you can fork it, right now I'm merging all changes until a stable release comes out. When a stable 7.0.0 release comes out, I'll only start merging stable releases instead of snapshots.

This comment has been minimized.

Sign in to view

Copy link
@Telesphoreo

Telesphoreo Jun 16, 2019

Contributor

Major bump here but a stable WorldEdit is out now so it may be time to investigate in updating.

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Jun 22, 2019

Author Member

@Telesphoreo As soon as I get some time to dedicate to this I'll look at sorting a load of updates and such to make things more stable. I'm aware a lot has happened since I last looked at the repo so will need to figure out what the delta is.
<artifactId>worldedit-core</artifactId>
<version>6.1.0-TF</version>
<version>7.0.0-TF-SNAPSHOT-R0.2</version>
</dependency>

This comment has been minimized.

Sign in to view

Copy link
@JeromSar

JeromSar Oct 15, 2018

Member

Whitespace that needs to go methinks.

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Oct 15, 2018

Author Member

Removed all the extra whitespace from the POM in
7a7b332
</dependencies>

<build>
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@

import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.FUtil;
// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly.
//
//import me.totalfreedom.worldedit.LimitChangedEvent;
//import me.totalfreedom.worldedit.SelectionChangedEvent;
//
//The following two imports are a temporary measure as mentioned above.
//
import me.StevenLawson.worldedit.LimitChangedEvent;
import me.StevenLawson.worldedit.SelectionChangedEvent;
//
import me.totalfreedom.worldedit.LimitChangedEvent;
import me.totalfreedom.worldedit.SelectionChangedEvent;

import net.pravian.aero.component.PluginListener;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class DepreciationAggregator
{

public static Block getTargetBlock(LivingEntity entity, HashSet<Byte> transparent, int maxDistance)
public static Block getTargetBlock(LivingEntity entity, HashSet<Material> transparent, int maxDistance)

This comment has been minimized.

Sign in to view

Copy link
@JeromSar

JeromSar Oct 15, 2018

Member

Does this not cause the build to fail? If not, then this deprecated proxy is redundant.

This comment has been minimized.

Sign in to view

Copy link
@Wild1145

Wild1145 Oct 15, 2018

Author Member

The change got the build to pass. I plan to go through and try to retire this file in general in the near future if its possible / practical so this is purely a temporary fix which will hopefully be retired in the near future.
{
return entity.getTargetBlock(transparent, maxDistance);
}
Expand Down

0 comments on commit 04c2287

Please sign in to comment.