Refactor a few things

 * Reorganize build.gradle
 * Upgrade gradle to 4.6
 * Rename items in code to match actual names
 * Reformat JSON
 * Remove rift item
 * Move rift tile entity to tileentities package
 * Remove unnecessary .gitignore entries

Author: Runemoro

.gitignore

@@ -24,8 +24,5 @@ build
 
 # other
 run
-libs
-forge-*-changelog.txt
 .DS_Store
 Thumbs.db
-logs

build.gradle

@@ -18,67 +18,58 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 repositories {
     maven { url "https://jitpack.io" }
-    ivy {
-        url 'https://github.com/'
-        layout 'pattern', {
-            //noinspection GroovyAssignabilityCheck (IntelliJ is wrong)
-            artifact '/[organisation]/[module]/raw/master/repository/snapshots/[revision].[ext]'
-        }
-    }
 }
 
-// Version info
-String baseversion = "3.0" // Set beta to 0 after changing this
-int beta = 7 // Set this to 0 for a non-beta release
-int betaSub = 1
-ext.mcversion = "1.12.2"
-ext.forgeversion = "14.23.2.2623"
-String mcpversion = "snapshot_20180227"
+configurations {
+    embed
+    compile.extendsFrom(embed)
+}
 
-String suffix = ""
-String shortSuffix = ""
-if (beta != 0) {
-    suffix += ".$beta" + "-b"
-    if (betaSub != 0) {
-        suffix += "-$betaSub"
-    }
-    shortSuffix = suffix
-    if (System.getenv("TRAVIS_BUILD_NUMBER") != null && beta != 0) {
-        suffix += "+${System.getenv("TRAVIS_BUILD_NUMBER")}"
-    } else {
-        suffix += "+UNOFFICIAL"
-    }
+dependencies {
+    embed 'com.flowpowered:flow-math:1.0.3'
+    embed 'org.jgrapht:jgrapht-core:1.1.0'
+    embed 'com.github.DimensionalDevelopment:poly2tri.java:master-SNAPSHOT'
+    compileOnly 'com.github.DimensionalDevelopment:AnnotatedNBT:-SNAPSHOT'
+    compileOnly 'com.github.OpenCubicChunks:CubicChunks:MC_1.12-SNAPSHOT'
 }
-version = ext.modversion = baseversion + suffix
 
+// Mod version
+version = ext.modversion = "3.0.7"
+boolean isBeta = true
 group = "org.dimdev.dimdoors"
-archivesBaseName = "Dimdoors"
-jar.archiveName = "Dimdoors-" + version + ".jar" // Constant name for travis
 
-sourceCompatibility = "1.8"
-compileJava {
-    //options.compilerArgs += "-proc:only"
+// Build number
+String fullVersion = version
+if (System.getenv("TRAVIS_BUILD_NUMBER") != null) {
+    fullVersion += "+${System.getenv("TRAVIS_BUILD_NUMBER")}"
+} else {
+    fullVersion += "+UNOFFICIAL"
+}
+if (isBeta) {
+    fullVersion += "-b"
 }
 
+// Jar name format
+archivesBaseName = "DimensionalDoors"
+jar.archiveName = "DimensionalDoors-" + fullVersion + ".jar" // Constant name for travis
+
+// Minecraft, MCP, Forge, and Java versions
+sourceCompatibility = targetCompatibility = "1.8"
+ext.mcversion = "1.12.2"
+ext.forgeversion = "14.23.2.2623"
+String mcpversion = "snapshot_20180227"
+
 minecraft {
     version = "$mcversion-$forgeversion"
     runDir = "run"
     mappings = mcpversion
-    replace '${version}', baseversion + shortSuffix
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    replace '${version}', fullVersion
+    makeObfSourceJar = false // Unobfuscated sources jar
 }
 
-configurations {
-    embed
-    compile.extendsFrom(embed)
-}
-
-dependencies {
-    embed 'com.flowpowered:flow-math:1.0.3'
-    embed 'org.jgrapht:jgrapht-core:1.1.0'
-    embed 'com.github.DimensionalDevelopment:poly2tri.java:master-SNAPSHOT'
-    compileOnly 'com.github.DimensionalDevelopment:AnnotatedNBT:-SNAPSHOT'
-    compileOnly 'com.github.OpenCubicChunks:CubicChunks:MC_1.12-SNAPSHOT'
+// Tasks
+compileJava {
+    //options.compilerArgs += "-proc:only" // To debug AnnotatedNBT code generation
 }
 
 jar {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Tue Dec 19 19:32:34 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 package org.dimdev.dimdoors;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.text.TextComponentTranslation;
 import org.dimdev.dimdoors.shared.ModConfig;
 import org.dimdev.dimdoors.shared.commands.CommandFabricConvert;
@@ -49,7 +48,7 @@ public class DimDoors {
         @Override
         @SideOnly(Side.CLIENT)
         public ItemStack getTabIconItem() {
-            return new ItemStack(ModItems.DIMENSIONAL_DOOR);
+            return new ItemStack(ModItems.IRON_DIMENSIONAL_DOOR);
         }
     };
 

gradlew

@@ -31,24 +31,24 @@ public static void registerModels() {
         register(getItemFromBlock(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR));
 
         //Item registration
-        register(ModItems.DIMENSIONAL_DOOR);
+        register(ModItems.IRON_DIMENSIONAL_DOOR);
         register(ModItems.GOLD_DIMENSIONAL_DOOR);
         register(ModItems.GOLD_DOOR);
-        register(ModItems.PERSONAL_DIMENSIONAL_DOOR);
+        register(ModItems.QUARTZ_DIMENSIONAL_DOOR);
         register(ModItems.QUARTZ_DOOR);
         register(ModItems.STABLE_FABRIC);
-        register(ModItems.CHAOS_DOOR);
-        register(ModItems.WARP_DIMENSIONAL_DOOR);
+        register(ModItems.UNSTABLE_DIMENSIONAL_DOOR);
+        register(ModItems.WOOD_DIMENSIONAL_DOOR);
         register(ModItems.WORLD_THREAD);
-        register(ModItems.RIFT_CONNECTION_TOOL);
+        register(ModItems.RIFT_CONFIGURATION_TOOL);
         register(ModItems.RIFT_BLADE);
         register(ModItems.RIFT_REMOVER);
         register(ModItems.RIFT_SIGNATURE);
         register(ModItems.STABILIZED_RIFT_SIGNATURE);
-        register(ModItems.BOOTS_WOVEN_WORLD_THREAD);
-        register(ModItems.CHESTPLATE_WOVEN_WORLD_THREAD);
-        register(ModItems.HELMET_WOVEN_WORLD_THREAD);
-        register(ModItems.LEGGINGS_WOVEN_WORLD_THREAD);
+        register(ModItems.WOVEN_WORLD_THREAD_BOOTS);
+        register(ModItems.WOVEN_WORLD_THREAD_CHESTPLATE);
+        register(ModItems.WOVEN_WORLD_THREAD_HELMET);
+        register(ModItems.WOVEN_WORLD_THREAD_LEGGINGS);
     }
 
     public static void registerModelVariants() {

src/main/java/org/dimdev/dimdoors/DimDoors.java

@@ -47,13 +47,13 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // T
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABLE_FABRIC, 1),
                 "yxy", 'x', Items.ENDER_PEARL, 'y', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.DIMENSIONAL_DOOR, 1),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.IRON_DIMENSIONAL_DOOR, 1),
                 "yxy", 'x', ModItems.STABLE_FABRIC, 'y', Items.IRON_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.CHAOS_DOOR, 1),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.UNSTABLE_DIMENSIONAL_DOOR, 1),
                 "xyx", 'x', Items.ENDER_EYE, 'y', Items.IRON_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WARP_DIMENSIONAL_DOOR, 1),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOOD_DIMENSIONAL_DOOR, 1),
                 "yxy", 'x', Items.ENDER_PEARL, 'y', Items.OAK_DOOR));
 
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR, 1),
@@ -65,7 +65,7 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // T
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DOOR, 1),
                 "yy", "yy", "yy", 'y', Items.GOLD_INGOT));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.PERSONAL_DIMENSIONAL_DOOR, 1),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DIMENSIONAL_DOOR, 1),
                 "yx", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.QUARTZ_DOOR));
 
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DOOR, 1),
@@ -75,7 +75,7 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // T
                 "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD));
 
         //should not be craftable
-        /*event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONNECTION_TOOL),
+        /*event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONFIGURATION_TOOL),
         " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.STABLE_FABRIC, 'x', ModItems.WORLD_THREAD, 'w', Items.DIAMOND));*/
 
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER),
@@ -93,28 +93,28 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // T
         event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABILIZED_RIFT_SIGNATURE),
                 " x ", "xyx", " x ", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.RIFT_SIGNATURE));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.HELMET_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_HELMET),
                 "xxx", "x x", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.CHESTPLATE_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_CHESTPLATE),
                 "x x", "xxx", "xxx", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.LEGGINGS_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_LEGGINGS),
                 "xxx", "x x", "x x", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.BOOTS_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_BOOTS),
                 "x x", "x x", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.HELMET_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_HELMET),
                 "xyx", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_HELMET));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.CHESTPLATE_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_CHESTPLATE),
                 "x x", "xyx", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_CHESTPLATE));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.LEGGINGS_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_LEGGINGS),
                 "xyx", "x x", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_LEGGINGS));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.BOOTS_WOVEN_WORLD_THREAD),
+        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_BOOTS),
                 " y ", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_BOOTS));
     }
 }

src/main/java/org/dimdev/dimdoors/client/ModelManager.java

@@ -1,6 +1,6 @@
 package org.dimdev.dimdoors.shared;
 
-import org.dimdev.dimdoors.shared.rifts.TileEntityRift;
+import org.dimdev.dimdoors.shared.tileentities.TileEntityRift;
 import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.math.RayTraceResult;

src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java

@@ -24,7 +24,7 @@ public BlockDimensionalDoorIron() {
 
     @Override
     public Item getItem() {
-        return ModItems.DIMENSIONAL_DOOR;
+        return ModItems.IRON_DIMENSIONAL_DOOR;
     }
 
     @Override