Merge remote-tracking branch 'refs/remotes/origin/1.10-WIP' into 1.10-Pockets

src/main/java/com/zixiken/dimdoors/CraftingManager.java

@@ -36,6 +36,15 @@ public class CraftingManager {
                 "yxy", 'y', ModItems.itemDoorQuartz, 'x', ModItems.itemStableFabric);
 
         GameRegistry.addRecipe(new ShapedOreRecipe(ModItems.itemDoorQuartz,
-                "yy", "yy", "yy", 'y', "oreQuartz"));
+                "yy", "yy", "yy", 'y', "quartz"));
+        
+        GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftBlade),
+                "y", "y", "x", 'y', ModItems.itemStableFabric, 'x', Items.IRON_SWORD);
+        
+        GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftBlade),
+                "y", "y", "x", 'y', ModItems.itemStableFabric, 'x', Items.IRON_SWORD);
+        
+        GameRegistry.addRecipe(new ItemStack(ModItems.itemRiftConnectionTool),
+                " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.itemStableFabric, 'x', ModItems.itemWorldThread, 'w', Items.DIAMOND);
     }
 }

src/main/java/com/zixiken/dimdoors/ModelManager.java

@@ -37,6 +37,7 @@ public class ModelManager {
         register(ModItems.itemDimDoorWarp);
         register(ModItems.itemWorldThread);
         register(ModItems.itemRiftConnectionTool);
+        register(ModItems.itemRiftBlade);
     }
 
     public static void registerModelVariants() {

src/main/java/com/zixiken/dimdoors/blocks/BlockRift.java

@@ -1,11 +1,10 @@
 package com.zixiken.dimdoors.blocks;
 
-import com.zixiken.dimdoors.DimDoors;
-import java.util.*;
-
 import com.zixiken.dimdoors.client.ClosingRiftFX;
 import com.zixiken.dimdoors.items.ModItems;
+import com.zixiken.dimdoors.tileentities.DDTileEntityBase;
 import com.zixiken.dimdoors.tileentities.TileEntityRift;
+import java.util.*;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.ITileEntityProvider;
@@ -26,8 +25,6 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.IFluidBlock;
-import com.zixiken.dimdoors.client.GoggleRiftFX;
-import com.zixiken.dimdoors.tileentities.DDTileEntityBase;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -68,7 +65,7 @@ public class BlockRift extends Block implements ITileEntityProvider {
         blocksImmuneToRift.add(Blocks.DIAMOND_BLOCK);
         blocksImmuneToRift.add(Blocks.EMERALD_BLOCK);
     }
-    
+
     @Override
     public boolean isReplaceable(IBlockAccess worldIn, BlockPos pos) {
         return false;
@@ -149,7 +146,7 @@ public class BlockRift extends Block implements ITileEntityProvider {
                 worldIn,
                 x + .5, y + .5, z + .5,
                 rand.nextGaussian() * 0.01D, rand.nextGaussian() * 0.01D, rand.nextGaussian() * 0.01D));
-        */
+         */
         if (tile.shouldClose) //renders an opposite color effect if it is being closed by the rift remover
         {
             FMLClientHandler.instance().getClient().effectRenderer.addEffect(new ClosingRiftFX(

src/main/java/com/zixiken/dimdoors/items/ItemRiftBlade.java

@@ -0,0 +1,18 @@
+package com.zixiken.dimdoors.items;
+
+import com.zixiken.dimdoors.DimDoors;
+import net.minecraft.item.ItemSword;
+
+/**
+ * Created by Jared Johnson on 1/20/2017.
+ */
+public class ItemRiftBlade extends ItemSword {
+    public static final String ID = "itemRiftBlade";
+
+    public ItemRiftBlade() {
+        super(ToolMaterial.IRON);
+        setCreativeTab(DimDoors.dimDoorsCreativeTab);
+        setUnlocalizedName(ID);
+        setRegistryName(ID);
+    }
+}

src/main/java/com/zixiken/dimdoors/items/ItemRiftConnectionTool.java

@@ -35,6 +35,8 @@ public class ItemRiftConnectionTool extends ItemTool {
     ItemRiftConnectionTool() {
         super(1.0F, -2.8F, ToolMaterial.WOOD, new HashSet());
         //@todo add extra stuff?
+        this.setMaxDamage(16);
+        setCreativeTab(DimDoors.dimDoorsCreativeTab);
         setUnlocalizedName(ID);
         setRegistryName(ID);
     }

src/main/java/com/zixiken/dimdoors/items/ModItems.java

@@ -17,6 +17,7 @@ public class ModItems {
     public static ItemDimDoorPersonal itemDimDoorPersonal;
     public static ItemBlockDimWall itemBlockDimWall;
     public static ItemRiftConnectionTool itemRiftConnectionTool;
+    public static ItemRiftBlade itemRiftBlade;
 
     public static void registerItems() {
         GameRegistry.register(itemDoorQuartz = new ItemDoorQuartz());
@@ -29,6 +30,7 @@ public class ModItems {
         GameRegistry.register(itemDimDoorChaos = new ItemDimDoorUnstable());
         GameRegistry.register(itemWorldThread = new ItemWorldThread());
         GameRegistry.register(itemRiftConnectionTool = new ItemRiftConnectionTool());
+        GameRegistry.register(itemRiftBlade = new ItemRiftBlade());
 
         //ItemBlocks
         GameRegistry.register(itemBlockDimWall = new ItemBlockDimWall());

src/main/resources/assets/dimdoors/lang/en_US.lang

@@ -9,16 +9,16 @@ tile.blockDimWallAltered.name=Altered Fabric
 tile.blockDimWallAncient.name=Ancient Fabric
 tile.blockDimWallPerm.name=Eternal Fabric
 tile.dimDoorWarp.name=Warp Door
-tile.rift.name=Rift
+tile.blockRift.name=Rift
 tile.BlockLimbo.name=Unraveled Fabric
 tile.chaosDoor.name=Unstable Door
 tile.dimDoor.name=Dimensional Door
-tile.dimHatch.name=Transdimensional Trapdoor
-item.itemGoldDoor.name=Golden Door
+tile.blockDimHatch.name=Transdimensional Trapdoor
+item.itemDoorGold.name=Golden Door
 item.itemDDKey=Rift Key
-item.itemQuartzDoor.name=Quartz Door
-item.itemQuartzDimDoor.name=Personal Dimensional Door
-item.itemGoldDimDoor.name=Golden Dimensional Door
+item.itemDoorQuartz.name=Quartz Door
+item.itemDimDoorQuartz.name=Personal Dimensional Door
+item.itemDimDoorGold.name=Golden Dimensional Door
 item.itemDimDoor.name=Dimensional Door
 item.itemDimDoorWarp.name=Warp Door
 item.itemLinkSignature.name=Rift Signature
@@ -26,8 +26,8 @@ item.itemStabilizedRiftSig.name=Stabilized Rift Signature
 item.itemRiftConnectionTool.name=Below Average Rift Connection Tool
 item.itemRiftRemover.name=Rift Remover
 item.itemStableFabric.name=Stable Fabric
-item.itemChaosDoor.name=Unstable Door
-item.ItemRiftBlade.name=Rift Blade
+item.itemDimDoorChaos.name=Chaos Door
+item.itemRiftBlade.name=Rift Blade
 item.itemWorldThread.name=World Thread
 info.riftkey.bound=Bound
 info.riftkey.unbound=Unbound

src/main/resources/assets/dimdoors/models/item/blockDimHatch.json

@@ -1,10 +1,3 @@
 {
-  "parent": "dimdoors:block/blockDimHatch_top",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    }
-  }
+  "parent": "dimdoors:block/blockDimHatch_bottom"
 }

src/main/resources/assets/dimdoors/models/item/itemRiftBlade.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "dimdoors:items/itemRiftBlade"
+  }
+}