Update to 1.12.2, fix west- and east-facing conveyors

elytra · Nov 14, 2017 · 4eaef90 · 4eaef90
1 parent d4bf7ba
commit 4eaef90
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,16 +27,16 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 group = "io.github.elytra"
 archivesBaseName = "Engination"
-version = "MC1.12.0_ver1.07.01"
+version = "MC1.12.2_ver1.07.02"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-  //version = "1.11.2-13.20.0.2226";
-  //mappings = "snapshot_20170205";
-  version = "1.12-14.21.1.2443";
-  mappings = "snapshot_20170817";
+  //version = '1.12.1-14.22.0.2446'
+  version = '1.12.2-14.23.0.2542'
+  mappings = 'snapshot_20171114'
+  //mappings = 'snapshot_20170817'
 
   runDir = "minecraft"
 

diff --git a/src/main/java/io/github/elytra/engination/Engination.java b/src/main/java/io/github/elytra/engination/Engination.java
@@ -72,11 +72,9 @@
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.registries.IForgeRegistry;

diff --git a/src/main/java/io/github/elytra/engination/Proxy.java b/src/main/java/io/github/elytra/engination/Proxy.java
@@ -28,9 +28,7 @@
 
 public class Proxy {
 	public void preInit() {}
-
 	@SubscribeEvent
 	public void onModelRegister(ModelRegistryEvent e) {
-
 	}
 }
diff --git a/src/main/java/io/github/elytra/engination/block/BlockConveyor.java b/src/main/java/io/github/elytra/engination/block/BlockConveyor.java
@@ -85,8 +85,8 @@ private void shootPlayer(World world, BlockPos pos, Entity ent) {
 		//double scale = 1.2d;
 		Vec3d motion = new Vec3d(vec.getX()*scale, vec.getY()*scale, vec.getZ()*scale);
 
-		ent.motionX = adjustScalar(ent.motionX, motion.y);
-		ent.motionY = adjustScalar(ent.motionY, motion.x);
+		ent.motionX = adjustScalar(ent.motionX, motion.x);
+		ent.motionY = adjustScalar(ent.motionY, motion.y);
 		ent.motionZ = adjustScalar(ent.motionZ, motion.z);
 	}
 

diff --git a/src/main/java/io/github/elytra/engination/item/ItemTomato.java b/src/main/java/io/github/elytra/engination/item/ItemTomato.java
@@ -65,7 +65,7 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
 
         if (!world.isRemote) {
             EntityTomato tomato = new EntityTomato(world, player);
-            tomato.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F);
+            tomato.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F);
             //Adjustments are because newly-aggressive clientside collisions were causing premature tomato-face
             tomato.posX += player.getLookVec().x*2f;
             tomato.posY += player.getLookVec().y*1.5f;