1.9 is functional \o/ (apart from blocks still rendering wrong in the inventore)

Author: XDjackieXD

src/main/java/at/chaosfield/openradio/block/BaseItemBlock.java

@@ -0,0 +1,26 @@
+package at.chaosfield.openradio.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by XDjackieXD
+ */
+public class BaseItemBlock extends ItemBlock{
+    public BaseItemBlock(Block block){
+        super(block);
+        this.setHasSubtypes(false);
+        this.setMaxDamage(0);
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack stack){
+        return this.getUnlocalizedName();
+    }
+
+    @Override
+    public int getMetadata(int meta){
+        return meta;
+    }
+}

src/main/java/at/chaosfield/openradio/entity/LaserEntity.java

@@ -1,10 +1,16 @@
 package at.chaosfield.openradio.entity;
 
 import at.chaosfield.openradio.OpenRadio;
+import at.chaosfield.openradio.block.LaserBlock;
+import at.chaosfield.openradio.interfaces.ILaserModifier;
 import at.chaosfield.openradio.render.LaserParticle;
+import at.chaosfield.openradio.tileentity.LaserTileEntity;
 import at.chaosfield.openradio.util.Location;
+import net.minecraft.init.Blocks;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.fml.relauncher.Side;
@@ -198,19 +204,19 @@ public void onEntityUpdate() {
             }
         }
 
-        /*Vec3d posVec = new Vec3d(this.posX, this.posY, this.posZ);
+        Vec3d posVec = new Vec3d(this.posX, this.posY, this.posZ);
         Vec3d nextPosVec = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
-        MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(posVec, nextPosVec);
+        RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(posVec, nextPosVec);
 
 
         if(movingobjectposition != null){
-            if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
-                if(this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal){
+            if(movingobjectposition.typeOfHit == RayTraceResult.Type.BLOCK)
+                if(this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.PORTAL){
                     this.setPortal(this.getPosition());
-                }else if(this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock().getMaterial().isOpaque()){ //only collide with non-transparent blocks
+                }else if(this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock().getMaterial(this.worldObj.getBlockState(movingobjectposition.getBlockPos())).isOpaque()){ //only collide with non-transparent blocks
                     this.onImpact(movingobjectposition);
                 }
-        }*/
+        }
 
         this.posX += this.motionX;
         this.posY += this.motionY;
@@ -271,22 +277,21 @@ public boolean writeToNBTOptional(NBTTagCompound nbtTagCompound){
         return false;
     }
 
-    //TODO fix impact
-    /*protected void onImpact(MovingObjectPosition mop){
+    protected void onImpact(RayTraceResult mop){
         TileEntity senderLaserTe = null;
         if(!worldObj.isRemote){
             senderLaserTe = DimensionManager.getWorld(senderLaser.getDim()).getTileEntity(senderLaser.getPos());
         }
 
-        if(mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK){
+        if(mop.typeOfHit == RayTraceResult.Type.BLOCK){
             Block hitBlock = this.worldObj.getBlockState(mop.getBlockPos()).getBlock();
 
             if(hitBlock instanceof LaserBlock && senderLaserTe instanceof LaserTileEntity){
 
                 TileEntity te = this.worldObj.getTileEntity(mop.getBlockPos());
                 if(te instanceof LaserTileEntity){
                     if(mop.sideHit.getIndex() == te.getBlockMetadata())
-                        ((LaserTileEntity) senderLaserTe).setDestination(this.worldObj.provider.getDimensionId(), mop.getBlockPos(), this.distance);
+                        ((LaserTileEntity) senderLaserTe).setDestination(this.worldObj.provider.getDimension(), mop.getBlockPos(), this.distance);
                     else
                         ((LaserTileEntity) senderLaserTe).disconnect();
                 }else
@@ -310,7 +315,7 @@ public boolean writeToNBTOptional(NBTTagCompound nbtTagCompound){
             if(senderLaserTe instanceof LaserTileEntity)
                 ((LaserTileEntity) senderLaserTe).disconnect();
         }
-    }*/
+    }
 
     public double getMultiplier(){
         return multiplier;

src/main/java/at/chaosfield/openradio/init/Blocks.java

@@ -1,9 +1,12 @@
 package at.chaosfield.openradio.init;
 
 //import at.chaosfield.openradio.block.AEEncoderBlock;
+import at.chaosfield.openradio.OpenRadio;
+import at.chaosfield.openradio.block.BaseItemBlock;
 import at.chaosfield.openradio.block.LaserBlock;
 //import net.minecraftforge.fml.common.Loader;
 import at.chaosfield.openradio.block.LensBlock;
+import net.minecraft.block.Block;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 /**
@@ -22,13 +25,22 @@ public static void init(){
         lensBlock1 = new LensBlock(1);
         lensBlock2 = new LensBlock(2);
         lensBlock3 = new LensBlock(3);
-        GameRegistry.registerBlock(laserBlock, "laser");
-        GameRegistry.registerBlock(lensBlock1, "lenst1");
-        GameRegistry.registerBlock(lensBlock2, "lenst2");
-        GameRegistry.registerBlock(lensBlock3, "lenst3");
+        
+        registerBlock(laserBlock, new BaseItemBlock(laserBlock), "laser");
+        registerBlock(lensBlock1, new BaseItemBlock(lensBlock1), "lenst1");
+        registerBlock(lensBlock2, new BaseItemBlock(lensBlock2), "lenst2");
+        registerBlock(lensBlock3, new BaseItemBlock(lensBlock3), "lenst3");
         /*if(Loader.isModLoaded("appliedenergistics2")) {
             aeencoderBlock = new AEEncoderBlock();
-            GameRegistry.registerBlock(aeencoderBlock, "aeencoder");
+            ItemUtil.registerBlock(aeencoderBlock, "aeencoder");
         }*/
     }
+
+    public static void registerBlock(Block block, BaseItemBlock itemBlock, String name){
+        block.setUnlocalizedName(OpenRadio.MODID+"."+name);
+        block.setRegistryName(OpenRadio.MODID, name);
+        GameRegistry.register(block);
+        itemBlock.setRegistryName(block.getRegistryName());
+        GameRegistry.register(itemBlock);
+    }
 }

src/main/resources/assets/openradio/blockstates/laser.json

@@ -5,7 +5,8 @@
       "laser": "openradio:blocks/laser"
     },
     "model": "openradio:laser",
-    "particle": "openradio:blocks/laser"
+    "particle": "openradio:blocks/laser",
+    "transform": "forge:default-block"
   },
   "variants": {
     "facing":{

src/main/resources/assets/openradio/blockstates/lenst1.json

@@ -8,7 +8,8 @@
       "particle": "openradio:blocks/LensBlock"
     },
     "model": "openradio:lens",
-    "particle": "openradio:blocks/LensBlock"
+    "particle": "openradio:blocks/LensBlock",
+    "transform": "forge:default-block"
   },
   "variants": {
     "facing":{

src/main/resources/assets/openradio/blockstates/lenst2.json

@@ -8,7 +8,8 @@
       "particle": "openradio:blocks/LensBlock"
     },
     "model": "openradio:lens",
-    "particle": "openradio:blocks/LensBlock"
+    "particle": "openradio:blocks/LensBlock",
+    "transform": "forge:default-block"
   },
   "variants": {
     "facing":{

src/main/resources/assets/openradio/blockstates/lenst3.json

@@ -8,7 +8,8 @@
       "particle": "openradio:blocks/LensBlock"
     },
     "model": "openradio:lens",
-    "particle": "openradio:blocks/LensBlock"
+    "particle": "openradio:blocks/LensBlock",
+    "transform": "forge:default-block"
   },
   "variants": {
     "facing":{

src/main/resources/assets/openradio/models/item/adct1.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/adct1"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/adct2.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/adct2"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/adct3.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/adct3"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/dspt1.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/dspt1"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/dspt2.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/dspt2"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/dspt3.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/dspt3"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/laser.json

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

src/main/resources/assets/openradio/models/item/lasersocket.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/lasersocket"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/lasert1.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/lasert1"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }

src/main/resources/assets/openradio/models/item/lasert2.json

@@ -1,18 +1,6 @@
 {
-  "parent": "builtin/generated",
+  "parent": "item/generated",
   "textures": {
     "layer0": "openradio:items/lasert2"
-  },
-  "display": {
-    "thirdperson": {
-      "rotation": [ -90, 0, 0 ],
-      "translation": [ 0, 1, -3 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "firstperson": {
-      "rotation": [ 0, -135, 25 ],
-      "translation": [ 0, 4, 2 ],
-      "scale": [ 1.7, 1.7, 1.7 ]
-    }
   }
 }