From fb411653619e237d965b350b10692b58058d5c8b Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 2 Nov 2020 18:06:35 +0300 Subject: [PATCH] Server crash fixes --- src/main/java/ru/betterend/BetterEnd.java | 5 ----- src/main/java/ru/betterend/blocks/EndPortalBlock.java | 2 -- .../blocks/entities/render/PedestalItemRenderer.java | 2 -- src/main/java/ru/betterend/client/BetterEndClient.java | 6 ++++++ src/main/java/ru/betterend/util/SplineHelper.java | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index c35ea958..a579d455 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -21,7 +21,6 @@ import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; import ru.betterend.registry.EndTags; import ru.betterend.util.Logger; -import ru.betterend.util.TranslationHelper; import ru.betterend.world.generator.BetterEndBiomeSource; public class BetterEnd implements ModInitializer { @@ -49,10 +48,6 @@ public class BetterEnd implements ModInitializer { EndStructures.register(); FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); - - if (isDevEnvironment()) { - TranslationHelper.printMissingNames(); - } } public static Identifier makeID(String path) { diff --git a/src/main/java/ru/betterend/blocks/EndPortalBlock.java b/src/main/java/ru/betterend/blocks/EndPortalBlock.java index 965f2916..1e48fd9e 100644 --- a/src/main/java/ru/betterend/blocks/EndPortalBlock.java +++ b/src/main/java/ru/betterend/blocks/EndPortalBlock.java @@ -5,7 +5,6 @@ import java.util.Random; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.NetherPortalBlock; @@ -20,7 +19,6 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.dimension.DimensionType; - import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.TeleportingEntity; diff --git a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java index fdea900b..c3c28f21 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java @@ -2,7 +2,6 @@ package ru.betterend.blocks.entities.render; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderLayer; @@ -20,7 +19,6 @@ import net.minecraft.item.Items; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; - import ru.betterend.blocks.BlockProperties.PedestalState; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.basis.BlockPedestal; diff --git a/src/main/java/ru/betterend/client/BetterEndClient.java b/src/main/java/ru/betterend/client/BetterEndClient.java index 01f8ba71..5e2e4e88 100644 --- a/src/main/java/ru/betterend/client/BetterEndClient.java +++ b/src/main/java/ru/betterend/client/BetterEndClient.java @@ -4,12 +4,14 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.registry.Registry; +import ru.betterend.BetterEnd; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlockEntityRenders; import ru.betterend.registry.EndEntitiesRenders; import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndScreens; +import ru.betterend.util.TranslationHelper; public class BetterEndClient implements ClientModInitializer { @Override @@ -19,6 +21,10 @@ public class BetterEndClient implements ClientModInitializer { EndScreens.register(); EndParticles.register(); EndEntitiesRenders.register(); + + if (BetterEnd.isDevEnvironment()) { + TranslationHelper.printMissingNames(); + } } private void registerRenderLayers() { diff --git a/src/main/java/ru/betterend/util/SplineHelper.java b/src/main/java/ru/betterend/util/SplineHelper.java index c1b385df..c685d972 100644 --- a/src/main/java/ru/betterend/util/SplineHelper.java +++ b/src/main/java/ru/betterend/util/SplineHelper.java @@ -240,7 +240,7 @@ public class SplineHelper { public static List copySpline(List spline) { List result = new ArrayList(spline.size()); for (Vector3f v: spline) { - result.add(v.copy()); + result.add(new Vector3f(v.getX(), v.getY(), v.getZ())); } return result; } @@ -253,7 +253,7 @@ public class SplineHelper { public static void offset(List spline, Vector3f offset) { for (Vector3f v: spline) { - v.add(offset); + v.set(offset.getX() + v.getX(), offset.getY() + v.getY(), offset.getZ() + v.getZ()); } } }