MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Server crash fixes

Browse source
This commit is contained in:
paulevsGitch 2020-11-02 18:06:35 +03:00
parent 2b88f5db91
commit fb41165361
5 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ru/betterend/BetterEnd.java
View file

@ -21,7 +21,6 @@ import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures; import ru.betterend.registry.EndStructures;
import ru.betterend.registry.EndTags; import ru.betterend.registry.EndTags;
import ru.betterend.util.Logger; import ru.betterend.util.Logger;
import ru.betterend.util.TranslationHelper;
import ru.betterend.world.generator.BetterEndBiomeSource; import ru.betterend.world.generator.BetterEndBiomeSource;
public class BetterEnd implements ModInitializer { public class BetterEnd implements ModInitializer {
@ -49,10 +48,6 @@ public class BetterEnd implements ModInitializer {
EndStructures.register(); EndStructures.register();
FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register);
if (isDevEnvironment()) {
TranslationHelper.printMissingNames();
}
} }
public static Identifier makeID(String path) { public static Identifier makeID(String path) {

2
src/main/java/ru/betterend/blocks/EndPortalBlock.java
View file

@ -5,7 +5,6 @@ import java.util.Random;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.NetherPortalBlock; import net.minecraft.block.NetherPortalBlock;
@ -20,7 +19,6 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldAccess;
import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.interfaces.TeleportingEntity; import ru.betterend.interfaces.TeleportingEntity;

2
src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java
View file

@ -2,7 +2,6 @@ package ru.betterend.blocks.entities.render;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
@ -20,7 +19,6 @@ import net.minecraft.item.Items;
import net.minecraft.util.DyeColor; import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import ru.betterend.blocks.BlockProperties.PedestalState; import ru.betterend.blocks.BlockProperties.PedestalState;
import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalPedestal;
import ru.betterend.blocks.basis.BlockPedestal; import ru.betterend.blocks.basis.BlockPedestal;

6
src/main/java/ru/betterend/client/BetterEndClient.java
View file

@ -4,12 +4,14 @@ import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.registry.EndBlockEntityRenders; import ru.betterend.registry.EndBlockEntityRenders;
import ru.betterend.registry.EndEntitiesRenders; import ru.betterend.registry.EndEntitiesRenders;
import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndScreens; import ru.betterend.registry.EndScreens;
import ru.betterend.util.TranslationHelper;
public class BetterEndClient implements ClientModInitializer { public class BetterEndClient implements ClientModInitializer {
@Override @Override
@ -19,6 +21,10 @@ public class BetterEndClient implements ClientModInitializer {
EndScreens.register(); EndScreens.register();
EndParticles.register(); EndParticles.register();
EndEntitiesRenders.register(); EndEntitiesRenders.register();
if (BetterEnd.isDevEnvironment()) {
TranslationHelper.printMissingNames();
}
} }
private void registerRenderLayers() { private void registerRenderLayers() {

4
src/main/java/ru/betterend/util/SplineHelper.java
View file

@ -240,7 +240,7 @@ public class SplineHelper {
public static List<Vector3f> copySpline(List<Vector3f> spline) { public static List<Vector3f> copySpline(List<Vector3f> spline) {
List<Vector3f> result = new ArrayList<Vector3f>(spline.size()); List<Vector3f> result = new ArrayList<Vector3f>(spline.size());
for (Vector3f v: spline) { for (Vector3f v: spline) {
result.add(v.copy()); result.add(new Vector3f(v.getX(), v.getY(), v.getZ()));
} }
return result; return result;
} }
@ -253,7 +253,7 @@ public class SplineHelper {
public static void offset(List<Vector3f> spline, Vector3f offset) { public static void offset(List<Vector3f> spline, Vector3f offset) {
for (Vector3f v: spline) { for (Vector3f v: spline) {
v.add(offset); v.set(offset.getX() + v.getX(), offset.getY() + v.getY(), offset.getZ() + v.getZ());
} }
} }
} }