diff --git a/build.gradle b/build.gradle index 0c7d554..756a4c2 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'idea' apply plugin: 'maven-publish' -version = '1.4.7' +version = '1.4.8' group = 'com.codenamerevy.magicmirror' archivesBaseName = 'magicmirror' @@ -20,7 +20,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co minecraft { //Mappings Version - mappings channel: 'snapshot', version: '20200225-1.15.1' + mappings channel: 'snapshot', version: '20200406-1.15.1' runs { client { workingDirectory project.file('run') @@ -76,10 +76,10 @@ minecraft { dependencies { // Forge version - minecraft 'net.minecraftforge:forge:1.15.2-31.1.16' + minecraft 'net.minecraftforge:forge:1.15.2-31.1.37' } -// Manifest for reading by the runtime.. +// Manifest for reading by the runtime... jar { manifest { attributes([ diff --git a/src/main/java/com/codenamerevy/magicmirror/config/Config.java b/src/main/java/com/codenamerevy/magicmirror/config/Config.java index ae4606e..f86c771 100644 --- a/src/main/java/com/codenamerevy/magicmirror/config/Config.java +++ b/src/main/java/com/codenamerevy/magicmirror/config/Config.java @@ -20,7 +20,6 @@ public class Config { public static final CategoryGeneral GENERAL = new CategoryGeneral(); public static final CategoryDeveloper DEVELOPER = new CategoryDeveloper(); - public static final class CategoryGeneral { public static ForgeConfigSpec.BooleanValue enableIngredients; diff --git a/src/main/java/com/codenamerevy/magicmirror/content/items/ItemDimensionalMirror.java b/src/main/java/com/codenamerevy/magicmirror/content/items/ItemDimensionalMirror.java index 14d4dff..9dac3f5 100644 --- a/src/main/java/com/codenamerevy/magicmirror/content/items/ItemDimensionalMirror.java +++ b/src/main/java/com/codenamerevy/magicmirror/content/items/ItemDimensionalMirror.java @@ -1,7 +1,3 @@ -/** - * @author CodenameRevy - */ - package com.codenamerevy.magicmirror.content.items; import com.codenamerevy.magicmirror.init.SoundInit; diff --git a/src/main/java/com/codenamerevy/magicmirror/content/items/ItemMagicMirror.java b/src/main/java/com/codenamerevy/magicmirror/content/items/ItemMagicMirror.java index 5ea492e..e343116 100644 --- a/src/main/java/com/codenamerevy/magicmirror/content/items/ItemMagicMirror.java +++ b/src/main/java/com/codenamerevy/magicmirror/content/items/ItemMagicMirror.java @@ -1,7 +1,3 @@ -/** - * @author CodenameRevy - */ - package com.codenamerevy.magicmirror.content.items; import com.codenamerevy.magicmirror.init.ParticleInit; @@ -41,7 +37,7 @@ public void onUsingTick (ItemStack stack, LivingEntity entity,int count) { Random rand = entity.world.rand; for(int a = 0; a < 25; a++) { - entity.world.addParticle(ParticleInit.MIRROR_PARTICLE, entity.lastTickPosX + (rand.nextBoolean() ? -1 : 1) * Math.pow(rand.nextFloat(), 2) * 2, entity.lastTickPosY + rand.nextFloat() * 3 - 2, entity.lastTickPosZ + (rand.nextBoolean() ? -1 : 1) * Math.pow(rand.nextFloat(), 2) * 2, -1, -0.105D, -1); + entity.world.addParticle(ParticleInit.MIRROR_PARTICLE, entity.lastTickPosX + (rand.nextBoolean() ? -0.5 : 0.5) * Math.pow(rand.nextFloat(), 2) * 2, entity.lastTickPosY + rand.nextFloat() * 3 - 2, entity.lastTickPosZ + (rand.nextBoolean() ? -0.5 : 0.5) * Math.pow(rand.nextFloat(), 2) * 2, -1, -0.105D, -1); } } diff --git a/src/main/java/com/codenamerevy/magicmirror/particle/MirrorParticle.java b/src/main/java/com/codenamerevy/magicmirror/particle/MirrorParticle.java index 5f0ba21..8910e78 100644 --- a/src/main/java/com/codenamerevy/magicmirror/particle/MirrorParticle.java +++ b/src/main/java/com/codenamerevy/magicmirror/particle/MirrorParticle.java @@ -17,13 +17,13 @@ public class MirrorParticle extends SpriteTexturedParticle private MirrorParticle(IAnimatedSprite animatedSprite, World world, double x, double y, double z, double speedX, double speedY, double speedZ) { super(world, x, y, z, 0.5D - RAND.nextDouble(), speedY, 0.5D - RAND.nextDouble()); this.animatedSprite = animatedSprite; - this.motionY *= 0.20000000029082000D; + this.motionY *= 0.15D; if(speedX == 0.0D && speedZ == 0.0D) { - this.motionX *= 0.10000000029082000D; - this.motionZ *= 0.10000000029082000D; + this.motionX *= 0.5D; + this.motionZ *= 0.5D; } - this.particleScale *= 0.5F; - this.maxAge = (int)(7.5D / (Math.random() * 0.4D + 0.2D)); + this.particleScale *= 0.3F; + this.maxAge = (int)(7.5D / (Math.random() * 0.2D + 0.1D)); //was 7.5 0.4 and 0.2 this.canCollide = false; this.selectSpriteWithAge(animatedSprite); } @@ -40,15 +40,15 @@ public void tick() this.motionY += 0.04D; this.move(this.motionX, this.motionY, this.motionZ); if(this.posY == this.prevPosY){ - this.motionX *= 1.1D; - this.motionZ *= 1.1D; + this.motionX *= 0.5D; + this.motionZ *= 0.5D; } - this.motionX *= 0.9599999785423279D; - this.motionY *= 0.9599999785423279D; - this.motionZ *= 0.9599999785423279D; + this.motionX *= 0.5D; + this.motionY *= 0.5D; + this.motionZ *= 0.5D; if (this.onGround) { - this.motionX *= 0.699999988079071D; - this.motionZ *= 0.699999988079071D; + this.motionX *= 0.5D; + this.motionZ *= 0.5D; } } } diff --git a/src/main/java/com/codenamerevy/magicmirror/util/TeleportHelper.java b/src/main/java/com/codenamerevy/magicmirror/util/TeleportHelper.java index 08b5ab6..f8ab511 100644 --- a/src/main/java/com/codenamerevy/magicmirror/util/TeleportHelper.java +++ b/src/main/java/com/codenamerevy/magicmirror/util/TeleportHelper.java @@ -22,7 +22,6 @@ public class TeleportHelper { private static PlayerEntity player; private static ServerWorld serverWorld; - private static Entity ridingEntity; public static void travelHome(PlayerEntity player) { diff --git a/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java b/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java index bc6e303..7eac146 100644 --- a/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java +++ b/src/main/java/com/codenamerevy/magicmirror/util/handler/LootHandler.java @@ -1,3 +1,9 @@ +/* +TODO: Update this class +This method seems to sometimes work and sometimes it doesn't. +Need to find a more stable way to populate loot tables... + */ + package com.codenamerevy.magicmirror.util.handler; import com.codenamerevy.magicmirror.config.Config; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 48f4af0..14f2412 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -11,7 +11,8 @@ logoFile="logo.png" credits=''' CodenameRevy (Mod developer), MichaelLimaRodrigues (Brazilian Portuguese translations) -Sn4pe (Spanish translations)''' +Sn4pe (Spanish translations) +DirectorX (Russian translations)''' authors="CodenameRevy" description=''' Magic Mirror mod adds several new items that are used to teleport you to your bed location almost instantly!