A few final changes

 * Update readme
 * Reduce rift jitter
 * Rift size config option
 * Crafting recipes for colored fabric
 * Lang strings for config options

Author: Runemoro

README.md

@@ -1,8 +1,8 @@
 # Dimensional Doors
-[![forthebadge](https://api.travis-ci.org/DimensionalDevelopment/DimDoors.svg)](https://travis-ci.org/DimensionalDevelopment/DimDoors/builds) [![forthebadge](http://forthebadge.com/images/badges/designed-in-etch-a-sketch.svg)](http://forthebadge.com/) [![forthebadge](http://forthebadge.com/images/badges/built-with-science.svg)](http://forthebadge.com/) [![forthebadge](http://forthebadge.com/images/badges/as-seen-on-tv.svg)](http://forthebadge.com/)
+[![Build Status](https://api.travis-ci.org/DimensionalDevelopment/DimDoors.svg)](https://travis-ci.org/DimensionalDevelopment/DimDoors/builds)
 
 ## Overview
-This is the main repository for the rewrite of Dimensional Doors by StevenRS11. This repository contains the up-to-date code base and commits submitted. 
+This is the main repository for the rewrite of Dimensional Doors by StevenRS11. This repository contains the up-to-date code base and commits submitted.
 
 ## Discord Server
 For the main bits, we have a Discord server made specifically for talking about Dimensional Doors. It's also the place where the devs meet to discuss current progress on certain aspects, and get feedback from the team.
@@ -12,15 +12,17 @@ For the main bits, we have a Discord server made specifically for talking about
 ## Bugs and Suggestions
 Experiencing a bug or just have a suggestion that is in-line with the mod's lore? Make a ticket about it!
 
-### For Bugs
- - Include the mod version (if it was built by the team)
- - Minecraft Version (different versions can experience bugs that are not available in others)
- - Forge Version (different versions can experience bugs that are not available in others)
- - And a link to the error, preferablly, to PasteBin
+### Bug Reports
+You can report any bugs you find on [the issues page](https://github.com/DimensionalDevelopment/DimDoors/issues). Please include the following information:
+
+ - The version of the mod you're using
+ - Your Minecraft version (different versions can experience bugs that are not available in others)
+ - Your forge version (different versions can experience bugs that are not available in others)
+ - A list of other mods you're using, if the issue does not happen with only Dimensional Doors installed
+ - A crash report, or preferably a full log (latest.log and debug.log). We have a paste site at https://paste.dimdev.org/
 
-### For Suggestions
- - Include a detailed description with what you would like to see in the mod
- - It is also recommended that you explain how it can fit into the mods lore.
+### Suggestions
+For suggestions, please join [our discord server](https://discord.gg/f27hdrM), or [create a Github issue](https://github.com/DimensionalDevelopment/DimDoors/issues). Please include a detailed description with what you would like to see in the mod and explain how it can fit into the mods lore.
 
 ## Contributing
 There are many ways to contribute to the project. We encourage you to join our Discord server if you have any questions about how to contribute.
@@ -35,7 +37,7 @@ This project uses [Lombok](https://projectlombok.org/) to automatically generate
 [This page](https://github.com/DimensionalDevelopment/DimDoors/tree/1.12-WIP/src/main/resources/assets/dimdoors/lang) contains all the currently translated languages. To contribute a translation, start by copying the [en_US.lang file](https://github.com/DimensionalDevelopment/DimDoors/blob/1.12-WIP/src/main/resources/assets/dimdoors/lang/en_US.lang) to a text editor, and saving it as the [correct locale code](https://minecraft.gamepedia.com/Language#Available_languages). Translate **only what is to the right of the = sign**, and then click "Create a new file" on [this page](https://github.com/DimensionalDevelopment/DimDoors/tree/1.12-WIP/src/main/resources/assets/dimdoors/lang) to submit your translation. 
 
 ### Testing
-You can help us test the latest dev release and report bugs before we submit the next beta by downloading and playing using the latest built jar from here: https://github.com/DimensionalDevelopment/DimDoors/releases **IMPORTANT:** These jars are untested and might cause loss of pockets, rift connections, or worlds. Always back up your worlds folder before testing them. 
+You can help us test the latest dev release and report bugs before we submit the next release by downloading and playing using the latest built jar from here: https://github.com/DimensionalDevelopment/DimDoors/releases **IMPORTANT:** These jars are untested and might cause loss of pockets, rift connections, or worlds. Always back up your worlds folder before testing them.
 
 ## Join the Team
 Dimensional Development is always looking to expand (there are currently only 4 active members in the team) and introduce new members to the team and community. Join our Discord and talk to us! Tell us how you can help.

build.gradle

@@ -35,7 +35,7 @@ dependencies {
 
 // Mod version
 version = ext.modversion = "3.0.7"
-boolean isBeta = true
+boolean isBeta = false
 group = "org.dimdev.dimdoors"
 
 // Build number

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

@@ -38,8 +38,7 @@ public static void drawCrack(float riftRotation, LSystem.PolygonInfo poly, doubl
         float time = ((Minecraft.getSystemTime() + riftRandom) % 2000000) * motionSpeed;
         double[] jitters = new double[jCount];
 
-
-        double jitterScale = size * size * size / 1300f;
+        double jitterScale = size * size / 1100f;
         // We use random constants here on purpose just to get different wave forms
         double xJitter = jitterScale * Math.sin(1.1f * time*size) * Math.sin(0.8f * time);
         double yJitter = jitterScale * Math.sin(1.2f * time*size) * Math.sin(0.9f * time);

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

@@ -43,7 +43,7 @@ private void renderCrack(TileEntityFloatingRift rift, double x, double y, double
         GlStateManager.disableTexture2D();
         GlStateManager.enableBlend();
 
-        RiftCrackRenderer.drawCrack(rift.riftYaw, rift.getCurve(), rift.size / 120, x + 0.5, y + 1.5, z + 0.5);
+        RiftCrackRenderer.drawCrack(rift.riftYaw, rift.getCurve(), ModConfig.graphics.riftSize * rift.size / 120, x + 0.5, y + 1.5, z + 0.5);
 
         GlStateManager.disableBlend();
         GlStateManager.enableTexture2D();

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

@@ -28,7 +28,7 @@ public void onPreInitialization(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(EventHandler.class);
         MinecraftForge.EVENT_BUS.register(ModBlocks.class);
         MinecraftForge.EVENT_BUS.register(ModItems.class);
-        MinecraftForge.EVENT_BUS.register(CraftingManager.class); // TODO: ModRecipes?
+        MinecraftForge.EVENT_BUS.register(ModRecipes.class);
         MinecraftForge.EVENT_BUS.register(ModSounds.class);
         MinecraftForge.EVENT_BUS.register(ModBiomes.class);
 

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

@@ -9,6 +9,7 @@
 
 import static net.minecraftforge.common.config.Config.*;
 
+// TODO: fix missing/removed config options automatically on load
 @Config(modid = DimDoors.MODID, name = DimDoors.MODID, category = "")
 @Mod.EventBusSubscriber(modid = DimDoors.MODID)
 public final class ModConfig {
@@ -51,7 +52,7 @@ public static class General {
 
         @Name("depthSpreadFactor")
         @LangKey("dimdoors.general.depthSpreadFactor")
-        public int depthSpreadFactor = 10;
+        public int depthSpreadFactor = 20;
     }
 
     public static class Pockets {
@@ -136,6 +137,11 @@ public static class Graphics {
         @LangKey("dimdoors.graphics.highlightRiftCoreFor")
         @RangeInt(min = -1)
         public int highlightRiftCoreFor = 15000;
+
+        @Name("riftSize")
+        @LangKey("dimdoors.graphics.riftSize")
+        @RangeDouble(min = 0)
+        public double riftSize = 1;
     }
 
 

…dev/dimdoors/shared/CraftingManager.java …g/dimdev/dimdoors/shared/ModRecipes.javasrc/main/java/org/dimdev/dimdoors/shared/CraftingManager.java renamed to src/main/java/org/dimdev/dimdoors/shared/ModRecipes.java src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java renamed to src/main/java/org/dimdev/dimdoors/shared/ModRecipes.java

@@ -1,26 +1,28 @@
 package org.dimdev.dimdoors.shared;
 
-import org.dimdev.dimdoors.DimDoors;
-import org.dimdev.dimdoors.shared.blocks.ModBlocks;
-import org.dimdev.dimdoors.shared.items.ModItems;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
+import net.minecraft.item.crafting.*;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.registries.IForgeRegistry;
+import org.dimdev.dimdoors.DimDoors;
+import org.dimdev.dimdoors.shared.blocks.ModBlocks;
+import org.dimdev.dimdoors.shared.items.ModItems;
 
-public final class CraftingManager {
+public final class ModRecipes {
 
     public static ResourceLocation getNameForRecipe(ItemStack output) {
         ResourceLocation baseLoc = new ResourceLocation(DimDoors.MODID, output.getItem().getRegistryName().getResourcePath());
         ResourceLocation recipeLoc = baseLoc;
         int index = 0;
-        while (net.minecraft.item.crafting.CraftingManager.REGISTRY.containsKey(recipeLoc)) {
+        while (CraftingManager.REGISTRY.containsKey(recipeLoc)) {
             index++;
             recipeLoc = new ResourceLocation(DimDoors.MODID, baseLoc.getResourcePath() + "_" + index);
         }
@@ -42,79 +44,95 @@ public static IRecipe makeShapedOreRecipe(ItemStack output, Object... params) {
         return recipe;
     }
 
+    public static IRecipe makeShapedlessRecipe(ItemStack output, Object... params) {
+        ResourceLocation location = getNameForRecipe(output);
+        NonNullList<Ingredient> ingredients = NonNullList.create();
+        for (Object obj : params) {
+            ingredients.add(CraftingHelper.getIngredient(obj));
+        }
+        ShapelessRecipes recipe = new ShapelessRecipes(output.getItem().getRegistryName().toString(), output, ingredients);
+        recipe.setRegistryName(location);
+        return recipe;
+    }
+
     @SubscribeEvent
-    public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // TODO
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABLE_FABRIC, 1),
+    public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
+        IForgeRegistry<IRecipe> registry = event.getRegistry();
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.STABLE_FABRIC),
                 "yxy", 'x', Items.ENDER_PEARL, 'y', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.IRON_DIMENSIONAL_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.IRON_DIMENSIONAL_DOOR),
                 "yxy", 'x', ModItems.STABLE_FABRIC, 'y', Items.IRON_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.UNSTABLE_DIMENSIONAL_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.UNSTABLE_DIMENSIONAL_DOOR),
                 "xyx", 'x', Items.ENDER_EYE, 'y', Items.IRON_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOOD_DIMENSIONAL_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.WOOD_DIMENSIONAL_DOOR),
                 "yxy", 'x', Items.ENDER_PEARL, 'y', Items.OAK_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR),
                 "yx", 'x', Items.ENDER_PEARL, 'y', Blocks.TRAPDOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DIMENSIONAL_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DIMENSIONAL_DOOR),
                 "yxy", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.GOLD_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.GOLD_DOOR),
                 "yy", "yy", "yy", 'y', Items.GOLD_INGOT));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DIMENSIONAL_DOOR, 1),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DIMENSIONAL_DOOR),
                 "yx", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.QUARTZ_DOOR));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DOOR, 1),
-                "yy", "yy", "yy", 'y', Items.QUARTZ));
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DOOR), "yy", "yy", "yy", 'y', Items.QUARTZ));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE),
                 "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD));
-        
+
         //should not be craftable
-        /*event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONFIGURATION_TOOL),
+        /*registry.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),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER),
                 "xxx", "xyx", "xxx", 'x', Items.GOLD_INGOT, 'y', Items.ENDER_PEARL));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER),
                 " x ", "xyx", " x ", 'x', Items.GOLD_INGOT, 'y', ModItems.STABLE_FABRIC));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE),
                 "xxx", "xyx", "xxx", 'x', Items.IRON_INGOT, 'y', Items.ENDER_PEARL));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE),
                 " x ", "xyx", " x ", 'x', Items.IRON_INGOT, 'y', ModItems.STABLE_FABRIC));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABILIZED_RIFT_SIGNATURE),
+        registry.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.WOVEN_WORLD_THREAD_HELMET),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_HELMET),
                 "xxx", "x x", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_CHESTPLATE),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_CHESTPLATE),
                 "x x", "xxx", "xxx", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_LEGGINGS),
+        registry.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.WOVEN_WORLD_THREAD_BOOTS),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_BOOTS),
                 "x x", "x x", 'x', ModItems.WORLD_THREAD));
 
-        event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_HELMET),
+        registry.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.WOVEN_WORLD_THREAD_CHESTPLATE),
+        registry.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.WOVEN_WORLD_THREAD_LEGGINGS),
+        registry.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.WOVEN_WORLD_THREAD_BOOTS),
+        registry.register(makeShapedRecipe(new ItemStack(ModItems.WOVEN_WORLD_THREAD_BOOTS),
                 " y ", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_BOOTS));
+
+        for (int meta = 0; meta <= 15; meta++) {
+            registry.register(makeShapedlessRecipe(new ItemStack(ModItems.FABRIC, 1, meta),
+                    ModItems.FABRIC, new ItemStack(Items.DYE, 1, EnumDyeColor.byDyeDamage(meta).getMetadata())));
+        }
     }
 }

src/main/java/org/dimdev/dimdoors/shared/rifts/destinations/EscapeDestination.java

@@ -21,7 +21,7 @@
 
 @Getter @AllArgsConstructor @Builder(toBuilder = true) @ToString
 public class EscapeDestination extends RiftDestination {
-    boolean canEscapeLimbo = false;
+    @Builder.Default boolean canEscapeLimbo = false;
 
     public EscapeDestination() {}