From 945c488b49bad846be24b3e1df9e4d60ec832438 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 1 Oct 2020 20:12:42 +0300 Subject: [PATCH] A little refactor --- .../blocks/entities/render/EChestBlockEntityRenderer.java | 6 +++--- .../blocks/entities/render/ESignBlockEntityRenderer.java | 2 +- .../client/gui/EndStoneSmelterScreenHandler.java | 5 +++-- .../mixin/client/ClientPlayNetworkHandlerMixin.java | 5 +++-- .../ru/betterend/mixin/client/WorldRendererMixin.java | 8 ++++---- .../ru/betterend/recipe/AlloyingRecipeSerializer.java | 6 +++--- src/main/java/ru/betterend/tab/CreativeTab.java | 2 +- .../java/ru/betterend/world/biome/BiomeDefinition.java | 2 +- .../betterend/world/generator/BetterEndBiomeSource.java | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java index f8e542ec..f2aef4a2 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java @@ -168,9 +168,9 @@ public class EChestBlockEntityRenderer extends BlockEntityRenderer { public final static ScreenHandlerType HANDLER_TYPE = ScreenHandlerRegistry.registerSimple( - new Identifier(BetterEnd.MOD_ID, EndStoneSmelter.ID), EndStoneSmelterScreenHandler::new); + BetterEnd.getResId(EndStoneSmelter.ID), EndStoneSmelterScreenHandler::new); private final Inventory inventory; private final PropertyDelegate propertyDelegate; diff --git a/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java b/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java index 1fb9536c..76686bc6 100644 --- a/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java @@ -15,10 +15,11 @@ import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.thread.ThreadExecutor; + import ru.betterend.blocks.entities.ESignBlockEntity; import ru.betterend.client.gui.BlockSignEditScreen; -@Mixin(ClientPlayNetworkHandler.class) +@Mixin(value = ClientPlayNetworkHandler.class, priority = 1000) public class ClientPlayNetworkHandlerMixin { @Shadow @@ -50,4 +51,4 @@ public class ClientPlayNetworkHandlerMixin info.cancel(); } } -} +} \ No newline at end of file diff --git a/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java b/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java index 5ba52b0d..8a81b009 100644 --- a/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java +++ b/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java @@ -33,10 +33,10 @@ import ru.betterend.util.MHelper; @Mixin(WorldRenderer.class) public class WorldRendererMixin { - private static final Identifier NEBULA_1 = new Identifier(BetterEnd.MOD_ID, "textures/sky/nebula_2.png"); - private static final Identifier NEBULA_2 = new Identifier(BetterEnd.MOD_ID, "textures/sky/nebula_3.png"); - private static final Identifier HORIZON = new Identifier(BetterEnd.MOD_ID, "textures/sky/nebula_1.png"); - private static final Identifier FOG = new Identifier(BetterEnd.MOD_ID, "textures/sky/fog.png"); + private static final Identifier NEBULA_1 = BetterEnd.getResId("textures/sky/nebula_2.png"); + private static final Identifier NEBULA_2 = BetterEnd.getResId("textures/sky/nebula_3.png"); + private static final Identifier HORIZON = BetterEnd.getResId("textures/sky/nebula_1.png"); + private static final Identifier FOG = BetterEnd.getResId("textures/sky/fog.png"); private static VertexBuffer stars1; private static VertexBuffer stars2; diff --git a/src/main/java/ru/betterend/recipe/AlloyingRecipeSerializer.java b/src/main/java/ru/betterend/recipe/AlloyingRecipeSerializer.java index fad08f52..623929bf 100644 --- a/src/main/java/ru/betterend/recipe/AlloyingRecipeSerializer.java +++ b/src/main/java/ru/betterend/recipe/AlloyingRecipeSerializer.java @@ -18,11 +18,11 @@ public class AlloyingRecipeSerializer implements RecipeSerializer { - return new IllegalStateException("Item: " + rusultStr + " does not exist"); + return new IllegalStateException("Item: " + resultStr + " does not exists!"); })); float experience = JsonHelper.getFloat(json, "experience", 0.0F); int smeltTime = JsonHelper.getInt(json, "smelttime", 350); diff --git a/src/main/java/ru/betterend/tab/CreativeTab.java b/src/main/java/ru/betterend/tab/CreativeTab.java index 6f55e601..3f8988db 100644 --- a/src/main/java/ru/betterend/tab/CreativeTab.java +++ b/src/main/java/ru/betterend/tab/CreativeTab.java @@ -10,7 +10,7 @@ import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.ItemRegistry; public class CreativeTab { - public static final ItemGroup END_TAB = FabricItemGroupBuilder.create(new Identifier(BetterEnd.MOD_ID, "items")) + public static final ItemGroup END_TAB = FabricItemGroupBuilder.create(BetterEnd.getResId("items")) .icon(() -> new ItemStack(BlockRegistry.END_MYCELIUM)).appendItems(stacks -> { for (Item i : ItemRegistry.getModBlocks()) { stacks.add(new ItemStack(i)); diff --git a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java index 05730723..381ad64c 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java +++ b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java @@ -56,7 +56,7 @@ public class BiomeDefinition { private ConfiguredSurfaceBuilder surface; public BiomeDefinition(String name) { - this.id = new Identifier(BetterEnd.MOD_ID, name); + this.id = BetterEnd.getResId(name); } public BiomeDefinition setSurface(Block surfaceBlock) { diff --git a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java index ce17476b..cd37bdec 100644 --- a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java +++ b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java @@ -76,6 +76,6 @@ public class BetterEndBiomeSource extends BiomeSource { } public static void register() { - Registry.register(Registry.BIOME_SOURCE, new Identifier(BetterEnd.MOD_ID, "better_end_biome_source"), CODEC); + Registry.register(Registry.BIOME_SOURCE, BetterEnd.getResId("better_end_biome_source"), CODEC); } }