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

A little refactor

Browse source
This commit is contained in:
Aleksey 2020-10-01 20:12:42 +03:00
parent 26b95bb250
commit 945c488b49
9 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ru/betterend/blocks/entities/render/EChestBlockEntityRenderer.java
View file

@ -168,9 +168,9 @@ public class EChestBlockEntityRenderer extends BlockEntityRenderer<EChestBlockEn
if (block instanceof BlockChest) {
String name = Registry.BLOCK.getId(block).getPath();
LAYERS.put(Block.getRawIdFromState(block.getDefaultState()), new RenderLayer[] {
RenderLayer.getEntitySolid(new Identifier(BetterEnd.MOD_ID, "textures/entity/chest/" + name + ".png")),
RenderLayer.getEntitySolid(new Identifier(BetterEnd.MOD_ID, "textures/entity/chest/" + name + "_left.png")),
RenderLayer.getEntitySolid(new Identifier(BetterEnd.MOD_ID, "textures/entity/chest/" + name + "_right.png"))
RenderLayer.getEntitySolid(BetterEnd.getResId("textures/entity/chest/" + name + ".png")),
RenderLayer.getEntitySolid(BetterEnd.getResId("textures/entity/chest/" + name + "_left.png")),
RenderLayer.getEntitySolid(BetterEnd.getResId("textures/entity/chest/" + name + "_right.png"))
});
}
}

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

@ -111,7 +111,7 @@ public class ESignBlockEntityRenderer extends BlockEntityRenderer<ESignBlockEnti
Block block = ((BlockItem) item).getBlock();
if (block instanceof BlockSign) {
String name = Registry.BLOCK.getId(block).getPath();
RenderLayer layer = RenderLayer.getEntitySolid(new Identifier(BetterEnd.MOD_ID, "textures/entity/sign/" + name + ".png"));
RenderLayer layer = RenderLayer.getEntitySolid(BetterEnd.getResId("textures/entity/sign/" + name + ".png"));
LAYERS.put(Block.getRawIdFromState(block.getDefaultState()), layer);
}
}

5
src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java
View file

@ -3,6 +3,7 @@ package ru.betterend.client.gui;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Inventory;
@ -17,8 +18,8 @@ import net.minecraft.screen.ArrayPropertyDelegate;
import net.minecraft.screen.PropertyDelegate;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.screen.slot.Slot;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import ru.betterend.BetterEnd;
import ru.betterend.blocks.EndStoneSmelter;
import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
@ -29,7 +30,7 @@ import ru.betterend.recipe.AlloyingRecipe;
public class EndStoneSmelterScreenHandler extends AbstractRecipeScreenHandler<Inventory> {
public final static ScreenHandlerType<EndStoneSmelterScreenHandler> 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;

5
src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java
View file

@ -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();
}
}
}
}

8
src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java
View file

@ -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;

6
src/main/java/ru/betterend/recipe/AlloyingRecipeSerializer.java
View file

@ -18,11 +18,11 @@ public class AlloyingRecipeSerializer implements RecipeSerializer<AlloyingRecipe
JsonArray ingredients = JsonHelper.getArray(json, "ingredients");
Ingredient primaryInput = Ingredient.fromJson(ingredients.get(0));
Ingredient secondaryInput = Ingredient.fromJson(ingredients.get(1));
String rusultStr = JsonHelper.getString(json, "result");
String resultStr = JsonHelper.getString(json, "result");
String group = JsonHelper.getString(json, "group", "");
Identifier resultId = new Identifier(rusultStr);
Identifier resultId = new Identifier(resultStr);
ItemStack output = new ItemStack(Registry.ITEM.getOrEmpty(resultId).orElseThrow(() -> {
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);

2
src/main/java/ru/betterend/tab/CreativeTab.java
View file

@ -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));

2
src/main/java/ru/betterend/world/biome/BiomeDefinition.java
View file

@ -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) {

2
src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java
View file

@ -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);
}
}