Skip to content

Commit 3e372f1

Browse files
MikiP98MikiP98
committed
Renamed/moved the code a bit for more clarity
1 parent 58115f1 commit 3e372f1

11 files changed

Lines changed: 30 additions & 25 deletions

‎src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package io.github.mikip98.humilityafm;
22

33
import io.github.mikip98.humilityafm.config.ModConfig;
4-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.FloorCabinetBlockEntityRenderer;
5-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.FloorIlluminatedCabinetBlockEntityRenderer;
6-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.IlluminatedCabinetBlockEntityRenderer;
4+
import io.github.mikip98.humilityafm.content.block_entity_renderers.LightStripBlockEntityRenderer;
5+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.CabinetBlockEntityRenderer;
6+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.FloorCabinetBlockEntityRenderer;
7+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.FloorIlluminatedCabinetBlockEntityRenderer;
8+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.IlluminatedCabinetBlockEntityRenderer;
79
import io.github.mikip98.humilityafm.registries.BlockEntityRegistry;
810
import io.github.mikip98.humilityafm.registries.BlockRegistry;
911
import io.github.mikip98.humilityafm.util.mod_support.ModSupportManager;
1012
import io.github.mikip98.humilityafm.util.mod_support.SupportedMods;
1113
import net.fabricmc.api.ClientModInitializer;
1214
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
13-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.CabinetBlockEntityRenderer;
14-
import io.github.mikip98.humilityafm.content.blockentities.LightStripBlockEntityRenderer;
1515
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
1616
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
1717
import net.fabricmc.loader.api.FabricLoader;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/LightStripBlockEntityRenderer.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/LightStripBlockEntityRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package io.github.mikip98.humilityafm.content.blockentities;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers;
22

3+
import io.github.mikip98.humilityafm.content.blockentities.LightStripBlockEntity;
34
import io.github.mikip98.humilityafm.content.blocks.LightStripBlock;
45
import net.minecraft.block.BlockState;
56
import net.minecraft.block.StairsBlock;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/CabinetBlockEntityRenderer.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/CabinetBlockEntityRenderer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock;
22

3-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.ItemWallRendering;
3+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.ItemWallRendering;
4+
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.CabinetBlockEntity;
45
import io.github.mikip98.humilityafm.content.blocks.cabinet.CabinetBlock;
56
import net.fabricmc.api.EnvType;
67
import net.fabricmc.api.Environment;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/FloorCabinetBlockEntityRenderer.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/FloorCabinetBlockEntityRenderer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock;
22

3-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.ItemFloorRendering;
3+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.ItemFloorRendering;
4+
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.FloorCabinetBlockEntity;
45
import io.github.mikip98.humilityafm.content.blocks.cabinet.FloorCabinetBlock;
56
import net.fabricmc.api.EnvType;
67
import net.fabricmc.api.Environment;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/FloorIlluminatedCabinetBlockEntityRenderer.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/FloorIlluminatedCabinetBlockEntityRenderer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock;
22

3-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.ItemFloorRendering;
4-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.RenderSelfBrightening;
3+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.ItemFloorRendering;
4+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.RenderSelfBrightening;
5+
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.FloorIlluminatedCabinetBlockEntity;
56
import io.github.mikip98.humilityafm.content.blocks.cabinet.FloorIlluminatedCabinetBlock;
67
import net.fabricmc.api.EnvType;
78
import net.fabricmc.api.Environment;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/IlluminatedCabinetBlockEntityRenderer.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/IlluminatedCabinetBlockEntityRenderer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock;
22

3-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.ItemWallRendering;
4-
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering.RenderSelfBrightening;
3+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.ItemWallRendering;
4+
import io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering.RenderSelfBrightening;
5+
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.IlluminatedCabinetBlockEntity;
56
import io.github.mikip98.humilityafm.content.blocks.cabinet.IlluminatedCabinetBlock;
67
import net.fabricmc.api.EnvType;
78
import net.fabricmc.api.Environment;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/rendering/ItemFloorRendering.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/rendering/ItemFloorRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering;
22

33
import net.minecraft.block.BlockState;
44
import net.minecraft.block.enums.BlockHalf;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/rendering/ItemRendering.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/rendering/ItemRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering;
22

33
import io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.ImplementedInventory;
44
import net.minecraft.block.BlockState;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/rendering/ItemWallRendering.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/rendering/ItemWallRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering;
22

33
import net.minecraft.block.BlockState;
44
import net.minecraft.client.util.math.MatrixStack;

src/client/java/io/github/mikip98/humilityafm/content/blockentities/cabinetBlock/rendering/RenderSelfBrightening.java renamed to src/client/java/io/github/mikip98/humilityafm/content/block_entity_renderers/cabinetBlock/rendering/RenderSelfBrightening.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.mikip98.humilityafm.content.blockentities.cabinetBlock.rendering;
1+
package io.github.mikip98.humilityafm.content.block_entity_renderers.cabinetBlock.rendering;
22

3-
import io.github.mikip98.humilityafm.helpers.BlockEntityRendererHelper;
3+
import io.github.mikip98.humilityafm.content.block_entity_renderers.util.LightManipulation;
44
import net.minecraft.block.BlockState;
55
import net.minecraft.client.MinecraftClient;
66
import net.minecraft.client.render.VertexConsumerProvider;
@@ -47,8 +47,8 @@ default void renderSelf(
4747
);
4848
matrices.scale(scale, scale, scale);
4949

50-
int outsideLight = BlockEntityRendererHelper.multiplyLight(light, lightMultiplayer);
51-
outsideLight = BlockEntityRendererHelper.addLight(outsideLight, lightAddition);
50+
int outsideLight = LightManipulation.multiplyLight(light, lightMultiplayer);
51+
outsideLight = LightManipulation.addLight(outsideLight, lightAddition);
5252

5353
MinecraftClient.getInstance().getBlockRenderManager().renderBlockAsEntity(
5454
blockState, matrices, vertexConsumers, outsideLight, overlay

0 commit comments

Comments
 (0)