Finish Admin Teleport

Author: ROMVoid95

build.gradle

@@ -13,6 +13,7 @@ buildscript {
 plugins {
 	id 'java'
 	id 'eclipse'
+	id 'org.ajoberstar.grgit' version '3.1.1'
 }
 
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -49,11 +50,10 @@ repositories {
 		}
 	}
 	mavenCentral()
-    removeIf { it.url.host == 'files.minecraftforge.net' }
+	mavenLocal()
     maven { url 'https://jitpack.io' }
     maven { url "https://maven.minecraftforge.net/" }
 	maven { url "https://www.cursemaven.com" }
-	maven { url "https://maven.mjrlegends.com/" }
 	maven { url "http://dvs1.progwml6.com/files/maven" }
 	maven { url "http://maven.ic2.player.to" }
 	maven { url "https://blamejared.com/maven" }
@@ -76,23 +76,19 @@ dependencies {
     testCompileOnly 'org.projectlombok:lombok:1.18.20'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
-	compile("com.mjr.extraplanets:ExtraPlanets:1.12.2-0.7.2:dev") {
-		exclude module: 'jei_1.12.2'
-	}
+	compile "com.mjr.extraplanets:ExtraPlanets:1.12.2-0.7.3:dev"
 
 	compile "mezz.jei:jei_${mc_version}:4.16.1.302:api"
 	runtime "mezz.jei:jei_${mc_version}:4.16.1.302"
 
-	runtime "com.mjr.mjrlegendslib:MJRLegendsLib:1.12.2-1.2.0"
+	runtime "com.mjr.mjrlegendslib:MJRLegendsLib:1.12.2-1.2.1"
 	runtime "net.industrial-craft:industrialcraft-2:2.8.99-ex112:api"
 
 	compile "curse.maven:asmodeuscore-0.0.25-303101:3231302"
 	compile "curse.maven:galaxyspace-2.0.16-238770:3235468"
 	compile "curse.maven:zollerngalaxy-2.0.23-241940:3187752"
 	compile "curse.maven:moreplanets-2.2.1_280-261990:3165054"
 	runtime "curse.maven:stevekunglib-1.1.9-296019:3051420"
-	
-	deobfCompile "vazkii.patchouli:Patchouli:${patchouli_version}"
 }
 
 minecraft {
@@ -163,4 +159,12 @@ if (JavaVersion.current().isJava8Compatible()) {
 	}
 }
 
+import org.ajoberstar.grgit.Tag
+
+tasks.register('getChangelog') {
+	doLast {
+		println getGitChangelog()
+	}
+}
+
 build.dependsOn signJar

gradle/git2md_changelog.gradle

@@ -1,8 +1,8 @@
 def getGitChangelog() {
     try {
         def stdout = new ByteArrayOutputStream()
-        def gitHash = System.getenv('GIT_COMMIT')
-        def gitPrevHash = System.getenv('GIT_PREVIOUS_COMMIT')
+        def gitHash = grgit.head().abbreviatedId
+        def gitPrevHash = grgit.tag.list().reverse()[0].commit.id
         if(gitHash && gitPrevHash) {
             exec {
                 commandLine 'git', 'log', '--pretty=tformat:- %s - %aN', '' + gitPrevHash + '...' + gitHash

src/main/java/net/romvoid95/api/GalacticraftAddon.java

@@ -1,9 +1,11 @@
 package net.romvoid95.api;
 
-import java.util.stream.Stream;
+import java.util.List;
+import java.util.Optional;
 
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
+import net.romvoid95.api.versioning.Version;
 
 public enum GalacticraftAddon {
 
@@ -14,68 +16,91 @@ public enum GalacticraftAddon {
 	MOREPLANETS("moreplanets", "More Planets", RequiredLib.STEVEKUNGSLIB),
 	PLANETPROGRESSION("planetprogression", "Planet Progression", RequiredLib.MJRLEGENDSLIB),
 	ZOLLERNGALAXY("zollerngalaxy", "Zollern Galaxy", RequiredLib.NONE);
-	
-	private final String modId;
-	private final String displayName;
-	private final RequiredLib requiredLib;
-	private final boolean isLoaded;
-	private final Stream<ModContainer> stream = Loader.instance().getModList().stream();
-	
-	GalacticraftAddon(String modId, String displayName,  RequiredLib requiredLib) {
+
+	private final String					modId;
+	private final String					displayName;
+	private final RequiredLib				requiredLib;
+	private final boolean					isLoaded;
+	private final List<ModContainer>		list	= Loader.instance().getModList();
+	private final Optional<ModContainer>	modContainer;
+
+	GalacticraftAddon(String modId, String displayName, RequiredLib requiredLib) {
 		this.modId = modId;
 		this.displayName = displayName;
 		this.requiredLib = requiredLib;
-		this.isLoaded = stream.anyMatch(modContainer -> modContainer.getModId().equals(this.modId));
+		this.isLoaded = list.stream().anyMatch(modContainer -> modContainer.getModId().equals(this.modId));
+		this.modContainer = list.stream().filter(m -> m.getModId().equals(this.modId)).findFirst();
 	}
 
 	public String modId() {
+
 		return modId;
 	}
-	
+
 	public String displayName() {
 		return displayName;
 	}
-	
+
 	public boolean isLoaded() {
 		return isLoaded;
 	}
-	
+
+	public Version getVersion() {
+		if(modContainer.isPresent()) {
+			return new Version(modContainer.get().getVersion());
+		}
+		return null;
+	}
+
 	public RequiredLib getLibMod() {
 		return requiredLib;
 	}
-	
+
 	public String getLibModId() {
 		return requiredLib.modId();
 	}
-	
+
 	public boolean isLibModLoaded() {
 		return requiredLib.equals(RequiredLib.NONE) ? false : requiredLib.isLoaded();
 	}
 
+	public Version getLibModVersion() {
+		if(requiredLib.getLibMod().isPresent()) {
+			return new Version(requiredLib.getLibMod().get().getVersion());
+		}
+		return null;
+	}
+
 	private enum RequiredLib {
-		
+
 		NONE("none"),
 		ASMODEUSCORE("asmodeuscore"),
 		MJRLEGENDSLIB("mjrlegendslib"),
 		STEVEKUNGSLIB("stevekung's_lib"),
 		// Only used for MorePlanetsExtraMod
 		MOREPLANETS("moreplanets");
 
-		private final String modId;
-		private final boolean isLoaded;
-		private final Stream<ModContainer> stream = Loader.instance().getModList().stream();
+		private final String				modId;
+		private final boolean				isLoaded;
+		private final List<ModContainer>		list	= Loader.instance().getModList();
+		private final Optional<ModContainer>	modContainer;
 
 		RequiredLib(String modId) {
 			this.modId = modId;
-			this.isLoaded = stream.anyMatch(modContainer -> modContainer.getModId().equals(this.modId));
+			this.isLoaded = list.stream().anyMatch(modContainer -> modContainer.getModId().equals(this.modId));
+			this.modContainer = list.stream().filter(m -> m.getModId().equals(this.modId)).findFirst();
 		}
 
 		public String modId() {
 			return modId;
 		}
-		
+
 		public boolean isLoaded() {
 			return isLoaded;
 		}
+		
+		public Optional<ModContainer> getLibMod() {
+			return modContainer;
+		}
 	}
 }

src/main/java/net/romvoid95/api/feature/Feature.java

@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.romvoid95.api.config.def.Category;

src/main/java/net/romvoid95/api/world/data/ISchematic.java

@@ -0,0 +1,47 @@
+package net.romvoid95.api.world.data;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+
+public interface ISchematic {
+
+	IBlockState getBlockState(BlockPos pos);
+
+	boolean setBlockState(BlockPos pos, IBlockState blockState);
+
+	TileEntity getTileEntity(BlockPos pos);
+
+	List<TileEntity> getTileEntities();
+
+	void setTileEntity(BlockPos pos, TileEntity tileEntity);
+
+	void removeTileEntity(BlockPos pos);
+
+	List<Entity> getEntities();
+
+	void addEntity(Entity entity);
+
+	void removeEntity(Entity entity);
+
+	ItemStack getIcon();
+
+	void setIcon(ItemStack icon);
+
+	int getWidth();
+
+	int getLength();
+
+	int getHeight();
+
+	@Nonnull
+	String getAuthor();
+
+	void setAuthor(@Nonnull String author);
+}