Skip to content

Commit 7e2c0e7

Browse files
CallMeEchoCodesCallMeEchoCodes
authored
🔀 1.2.5
1.2.5
2 parents 4a751cf + 32813ab commit 7e2c0e7

182 files changed

Lines changed: 2519 additions & 1523 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ run/
117117
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
118118
!gradle-wrapper.jar
119119

120-
src/generated/.cache
120+
src/main/generated/.cache

‎build.gradle.kts‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Dependencies {
1515
val yarn = property("deps.yarn").toString()
1616

1717
val fabricApi = property("deps.fabricapi").toString()
18-
val cabinetApi = property("deps.cabinetapi").toString()
18+
val specter = property("deps.specter").toString()
1919
}
2020

2121
val mod = ModInfo()
@@ -47,8 +47,22 @@ dependencies {
4747
modImplementation("net.fabricmc:fabric-loader:${deps.loader}")
4848

4949
modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApi}")
50-
include("dev.callmeecho:cabinetapi:${deps.cabinetApi}")
51-
modImplementation("dev.callmeecho:cabinetapi:${deps.cabinetApi}")
50+
51+
fun specterModule(name: String) {
52+
include("dev.spiritstudios.specter:specter-$name:${deps.specter}")
53+
modImplementation("dev.spiritstudios.specter:specter-$name:${deps.specter}")
54+
}
55+
56+
specterModule("api")
57+
specterModule("block")
58+
specterModule("config")
59+
specterModule("core")
60+
specterModule("entity")
61+
specterModule("item")
62+
specterModule("registry")
63+
specterModule("render")
64+
65+
modRuntimeOnly("dev.spiritstudios.specter:specter-debug:${deps.specter}")
5266

5367
// will be switched back to lambdynamiclights once it's updated
5468
modCompileOnly("maven.modrinth:ryoamiclights:0.2.9+mc1.21-fabric")

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
org.gradle.jvmargs=-Xmx2G
22
org.gradle.parallel=true
33

4-
mod.version = 1.2.3
5-
mod.group = dev.callmeecho
4+
mod.version = 1.2.5
5+
mod.group = dev.spiritstudios
66
mod.id = hollow
77

88
deps.minecraft=1.21
99
deps.loader=0.15.11
1010
deps.yarn=1.21+build.9
1111

12-
deps.fabricapi=0.100.7+1.21
13-
deps.cabinetapi=1.3.5+1.21
12+
deps.fabricapi=0.103.0+1.21.1
13+
deps.specter=1.0.2

‎src/client/java/dev/callmeecho/hollow/HollowClient.java‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/client/java/dev/spiritstudios/hollow/HollowClient.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package dev.spiritstudios.hollow;
2+
3+
import dev.spiritstudios.hollow.block.HollowLogBlock;
4+
import dev.spiritstudios.hollow.particle.FireflyJarParticle;
5+
import dev.spiritstudios.hollow.registry.*;
6+
import dev.spiritstudios.hollow.render.entity.FireflyEntityRenderer;
7+
import dev.spiritstudios.hollow.render.entity.JarBlockEntityRenderer;
8+
import dev.spiritstudios.specter.api.ModMenuHelper;
9+
import dev.spiritstudios.specter.api.core.util.ReflectionHelper;
10+
import net.fabricmc.api.ClientModInitializer;
11+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
12+
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
13+
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
14+
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
15+
import net.minecraft.client.item.ModelPredicateProviderRegistry;
16+
import net.minecraft.client.render.RenderLayer;
17+
import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
18+
import net.minecraft.util.Identifier;
19+
20+
public class HollowClient implements ClientModInitializer {
21+
@Override
22+
public void onInitializeClient() {
23+
EntityRendererRegistry.register(HollowEntityTypeRegistrar.FIREFLY, FireflyEntityRenderer::new);
24+
25+
ModelPredicateProviderRegistry.register(
26+
HollowItemRegistrar.COPPER_HORN,
27+
Identifier.ofVanilla("tooting"),
28+
(stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
29+
);
30+
31+
BlockEntityRendererFactories.register(HollowBlockEntityRegistrar.JAR_BLOCK_ENTITY, JarBlockEntityRenderer::new);
32+
33+
ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> world != null && pos != null ? 0x208030 : 0x71C35C, HollowBlockRegistrar.LOTUS_LILYPAD);
34+
ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? 0x71C35C : -1, HollowItemRegistrar.LOTUS_LILYPAD);
35+
36+
ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> world != null && pos != null ? 0x208030 : 0x71C35C, HollowBlockRegistrar.GIANT_LILYPAD);
37+
ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? 0x71C35C : -1, HollowItemRegistrar.GIANT_LILYPAD);
38+
39+
ParticleFactoryRegistry.getInstance().register(HollowParticleRegistrar.FIREFLY_JAR, FireflyJarParticle.Factory::new);
40+
41+
ModMenuHelper.addConfig(Hollow.MODID, HollowConfig.INSTANCE.getId());
42+
}
43+
}

src/client/java/dev/callmeecho/hollow/HollowDynamicLights.java renamed to src/client/java/dev/spiritstudios/hollow/HollowDynamicLights.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package dev.callmeecho.hollow;
1+
package dev.spiritstudios.hollow;
22

3-
import dev.callmeecho.hollow.registry.HollowEntityTypeRegistrar;
3+
import dev.spiritstudios.hollow.registry.HollowEntityTypeRegistrar;
44
import dev.lambdaurora.lambdynlights.api.DynamicLightsInitializer;
55
import net.minecraft.util.math.MathHelper;
66
import org.thinkingstudio.ryoamiclights.api.DynamicLightHandlers;

src/client/java/dev/callmeecho/hollow/mixin/client/BackgroundRendererMixin.java renamed to src/client/java/dev/spiritstudios/hollow/mixin/client/BackgroundRendererMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package dev.callmeecho.hollow.mixin.client;
1+
package dev.spiritstudios.hollow.mixin.client;
22

33
import com.llamalad7.mixinextras.sugar.Local;
4-
import dev.callmeecho.cabinetapi.util.Easing;
5-
import dev.callmeecho.hollow.HollowTags;
4+
import dev.spiritstudios.hollow.HollowTags;
5+
import dev.spiritstudios.specter.api.core.util.Easing;
66
import net.minecraft.block.enums.CameraSubmersionType;
77
import net.minecraft.client.MinecraftClient;
88
import net.minecraft.client.render.BackgroundRenderer;

src/client/java/dev/callmeecho/hollow/particle/FireflyJarParticle.java renamed to src/client/java/dev/spiritstudios/hollow/particle/FireflyJarParticle.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.callmeecho.hollow.particle;
1+
package dev.spiritstudios.hollow.particle;
22

33
import net.minecraft.client.particle.*;
44
import net.minecraft.client.world.ClientWorld;
@@ -35,16 +35,13 @@ public ParticleTextureSheet getType() {
3535
public void tick() {
3636
super.tick();
3737

38-
if (this.age % 5 == 0 && this.random.nextInt(5) == 0) {
39-
lightTicks -= this.random.nextBetween(10, 15);
40-
} else {
41-
lightTicks += 1;
42-
}
38+
if (this.age % 5 == 0 && this.random.nextInt(5) == 0) lightTicks -= this.random.nextBetween(10, 15);
39+
else lightTicks += 1;
4340

4441
lightTicks = MathHelper.clamp(lightTicks, 0, 15);
4542

46-
double newY = MathHelper.sin((float) this.age / 15) * 0.0025;
47-
double newXZ = MathHelper.cos((float) this.age / 15) * 0.0025;
43+
double newY = MathHelper.sin((float) this.age / 15) * 0.0015;
44+
double newXZ = MathHelper.cos((float) this.age / 15) * 0.0015;
4845

4946
this.x += xMover ? newXZ : -newXZ;
5047
this.z += xMover ? newXZ : -newXZ;

src/client/java/dev/callmeecho/hollow/render/entity/FireflyEntityRenderer.java renamed to src/client/java/dev/spiritstudios/hollow/render/entity/FireflyEntityRenderer.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package dev.callmeecho.hollow.render.entity;
1+
package dev.spiritstudios.hollow.render.entity;
22

3-
import dev.callmeecho.hollow.entity.FireflyEntity;
3+
import dev.spiritstudios.hollow.entity.FireflyEntity;
44
import net.minecraft.client.render.OverlayTexture;
55
import net.minecraft.client.render.RenderLayer;
66
import net.minecraft.client.render.VertexConsumer;
@@ -14,7 +14,7 @@
1414
import net.minecraft.util.math.MathHelper;
1515
import net.minecraft.util.math.RotationAxis;
1616

17-
import static dev.callmeecho.hollow.Hollow.MODID;
17+
import static dev.spiritstudios.hollow.Hollow.MODID;
1818

1919
public class FireflyEntityRenderer extends EntityRenderer<FireflyEntity> {
2020
private static final Identifier TEXTURE = Identifier.of(MODID, "textures/entity/firefly.png");
@@ -54,18 +54,22 @@ protected int getBlockLight(FireflyEntity entity, BlockPos pos) {
5454
}
5555

5656
private void renderVertex(VertexConsumer vertexConsumer, MatrixStack.Entry entry, float x, float y, float u, float v, FireflyEntity entity, int light) {
57-
int color = ColorHelper.Argb.lerp(MathHelper.clampedLerp(0.0F, 15.0F, (1.0F - entity.getLightTicks() / 10.0F)) / 15.0F, 0xFF92CF40, 0xFF30352F);
58-
59-
float red = ColorHelper.Argb.getRed(color);
60-
float green = ColorHelper.Argb.getGreen(color);
61-
float blue = ColorHelper.Argb.getBlue(color);
57+
float red;
58+
float green;
59+
float blue;
6260

6361
if (entity.hasCustomName() && "jeb_".equals(entity.getName().getString())) {
6462
red = MathHelper.sin(entity.age * 0.1F) * 128.0F + 128.0F;
6563
green = MathHelper.sin(entity.age * 0.1F + (float) Math.toRadians(120.0F)) * 128.0F + 128.0F;
6664
blue = MathHelper.sin(entity.age * 0.1F + (float) Math.toRadians(240.0F)) * 128.0F + 128.0F;
65+
} else {
66+
int color = ColorHelper.Argb.lerp(MathHelper.clampedLerp(0.0F, 15.0F, (1.0F - entity.getLightTicks() / 10.0F)) / 15.0F, 0xFF92CF40, 0xFF30352F);
67+
68+
red = ColorHelper.Argb.getRed(color);
69+
green = ColorHelper.Argb.getGreen(color);
70+
blue = ColorHelper.Argb.getBlue(color);
6771
}
68-
72+
6973
vertexConsumer.vertex(entry, x - 0.5F, y - 0.25F, 0.0F)
7074
.color(red / 255.0F, green / 255.0F, blue / 255.0F, 1.0F)
7175
.texture(u, v)

src/client/java/dev/callmeecho/hollow/render/entity/JarBlockEntityRenderer.java renamed to src/client/java/dev/spiritstudios/hollow/render/entity/JarBlockEntityRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package dev.callmeecho.hollow.render.entity;
1+
package dev.spiritstudios.hollow.render.entity;
22

3-
import dev.callmeecho.hollow.block.entity.JarBlockEntity;
3+
import dev.spiritstudios.hollow.block.entity.JarBlockEntity;
44
import net.minecraft.client.render.VertexConsumerProvider;
55
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
66
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;

0 commit comments

Comments
 (0)