Fix render and register default targets

Author: Runemoro

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

@@ -27,7 +27,6 @@
 import org.dimdev.dimdoors.shared.entities.EntityMonolith;
 import org.dimdev.dimdoors.shared.items.ModItems;
 import org.dimdev.dimdoors.shared.pockets.SchematicHandler;
-import org.dimdev.dimdoors.shared.rifts.targets.VirtualTarget;
 import org.dimdev.dimdoors.shared.rifts.targets.*;
 import org.dimdev.dimdoors.shared.sound.ModSounds;
 import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift;
@@ -98,6 +97,9 @@ public void onPreInitialization(FMLPreInitializationEvent event) {
         // Register dimensions
         ModDimensions.registerDimensions();
 
+        // Register default targets
+        Targets.registerDefaultTargets();
+
         // Make config folder and check if config needs to be regenerated TODO
         configurationFolder = new File(event.getModConfigurationDirectory(), "/DimDoors");
         configurationFolder.mkdirs();

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

@@ -46,7 +46,7 @@ public static void drawCrack(float riftRotation, LSystem.PolygonInfo poly, doubl
 
         // Set color (nearly black, but inverts background)
         GlStateManager.color(0.08f, 0.08f, 0.08f, .3F);
-        glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
+        GlStateManager.blendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
 
         // Draw the rift
         GlStateManager.glBegin(GL11.GL_TRIANGLES);

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

@@ -42,7 +42,7 @@ private void renderCrack(TileEntityFloatingRift rift, double x, double y, double
         GlStateManager.disableTexture2D();
         GlStateManager.enableBlend();
 
-        RiftCrackRenderer.drawCrack(rift.riftYaw, rift.getCurve(), ModConfig.graphics.riftSize * rift.size / 120, x + 0.5, y + 1.5, z + 0.5);
+        RiftCrackRenderer.drawCrack(rift.riftYaw, rift.getCurve(), ModConfig.graphics.riftSize * rift.size / 150, x + 0.5, y + 1.5, z + 0.5);
 
         GlStateManager.disableBlend();
         GlStateManager.enableTexture2D();
@@ -60,7 +60,6 @@ private void renderTesseract(TileEntityFloatingRift rift, double x, double y, do
         GlStateManager.disableLighting();
         GlStateManager.pushMatrix();
         GlStateManager.disableCull();
-        GlStateManager.enableBlend();
 
         bindTexture(tesseract_path);
 
@@ -69,7 +68,6 @@ private void renderTesseract(TileEntityFloatingRift rift, double x, double y, do
 
         tesseract.draw(color, radian);
 
-        GlStateManager.disableBlend();
         GlStateManager.enableCull();
         GlStateManager.popMatrix();
         GlStateManager.enableLighting();

src/main/java/org/dimdev/dimdoors/shared/rifts/targets/RiftReference.java

@@ -71,6 +71,6 @@ public RGBA getColor() {
             Set<Location> otherRiftTargets = RiftRegistry.instance().getTargets(target);
             if (otherRiftTargets.size() == 1 && otherRiftTargets.contains(location)) return new RGBA(0, 1, 0, 1);
         }
-        return new RGBA(1, 1, 1, 1);
+        return new RGBA(1, 0, 0, 1);
     }
 }

src/main/java/org/dimdev/dimdoors/shared/rifts/targets/Targets.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fluids.Fluid;
+import org.dimdev.dimdoors.DimDoors;
 
 // A list of the default targets provided by dimcore. Add your own in ModTargets
 public final class Targets {
@@ -11,7 +12,10 @@ public final class Targets {
     public static final Class<IRedstoneTarget> REDSTONE = IRedstoneTarget.class;
 
     public static void registerDefaultTargets() {
-        DefaultTargets.registerDefaultTarget(ENTITY, (entity, relativeYaw, relativePitch) -> false);
+        DefaultTargets.registerDefaultTarget(ENTITY, (entity, relativeYaw, relativePitch) -> {
+            DimDoors.sendTranslatedMessage(entity, "rifts.unlinked");
+            return false;
+        });
         DefaultTargets.registerDefaultTarget(ITEM, stack -> false);
 
         DefaultTargets.registerDefaultTarget(FLUID, new IFluidTarget() {

src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityRift.java

@@ -183,10 +183,10 @@ public ITarget getTarget() {
     public boolean teleport(Entity entity) {
         riftStateChanged = false;
 
-        IEntityTarget target = getTarget().as(Targets.ENTITY);
-
         // Attempt a teleport
         try {
+            IEntityTarget target = getTarget().as(Targets.ENTITY);
+
             if (target.receiveEntity(entity, getSourceYaw(entity.rotationYaw), getSourcePitch(entity.rotationPitch))) {
                 VirtualLocation vloc = VirtualLocation.fromLocation(new Location(entity.world, entity.getPosition()));
                 DimDoors.sendTranslatedMessage(entity, "You are at x = " + vloc.getX() + ", y = ?, z = " + vloc.getZ() + ", w = " + vloc.getDepth());

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

@@ -118,7 +118,7 @@ commands.saveschem.success=Pocket %s has been successfully saved
 commands.generic.dimdoors.not_in_pocket_dim=You must be in a pocket dimension to use this command.
 commands.generic.dimdoors.not_in_pocket=You must be in a pocket to use this command.
 
-rifts.unlinked=This rift leads nowhere
+rifts.unlinked=This rift doesn't lead anywhere
 rifts.destinations.escape.cannot_escape_limbo=Nice try, but you'll need to either die or find some eternal fabric to get out of Limbo.
 rifts.destinations.escape.not_in_pocket_dim=You can only use this to escape from a pocket dimension!
 rifts.destinations.escape.did_not_use_rift=You didn't use a rift to enter the pocket dimension, so you ended up in Limbo!