Skip to content

Commit fee4a8d

Browse files
0.5.4.1
1 parent 5c3e783 commit fee4a8d

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 0.5.4.1
2+
Hotfix for 0.5.4
3+
4+
#### Bugfixes:
5+
- Copter bearing should render (and stop tweaking out)
6+
- Gas Nozzle restored to creative inventory
7+
- Props don't try to spin at comical speeds
8+
19
## 0.5.4
210
Balloons!
311

common/src/main/java/org/valkyrienskies/clockwork/ClockworkParticles.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
import net.createmod.catnip.lang.Lang;
55
import net.fabricmc.api.EnvType;
66
import net.fabricmc.api.Environment;
7-
import net.minecraft.client.Minecraft;
8-
import net.minecraft.client.particle.ParticleEngine;
9-
import net.minecraft.core.Registry;
107
import net.minecraft.core.particles.ParticleOptions;
118
import net.minecraft.core.particles.ParticleType;
129
import net.minecraft.core.registries.BuiltInRegistries;
13-
import net.minecraft.core.registries.Registries;
1410
import org.valkyrienskies.clockwork.content.curiosities.particles.PhysLightningParticle;
1511
import org.valkyrienskies.clockwork.content.logistics.gas.pockets.nozzle.LeakParticleData;
1612
import org.valkyrienskies.clockwork.platform.PlatformUtils;
@@ -43,7 +39,6 @@ public static void init() {
4339

4440
@Environment(EnvType.CLIENT)
4541
public static void initClient(Object event) {
46-
ParticleEngine particles = Minecraft.getInstance().particleEngine;
4742
for (final ClockworkParticles particle : values()) {
4843
//particle.entry.registerFactory(particles);
4944
PlatformUtils.registerParticleOnPlatform(particle.entry, event);
@@ -72,10 +67,5 @@ public ParticleEntry(final String name, final Supplier<? extends ICustomParticle
7267

7368
object = this.typeFactory.get().createType();
7469
}
75-
76-
@Environment(EnvType.CLIENT)
77-
public void registerFactory(final ParticleEngine particles) {
78-
typeFactory.get().register(object, particles);
79-
}
8070
}
8171
}

fabric/src/main/java/org/valkyrienskies/clockwork/platform/fabric/PlatformUtilsImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
88
import com.tterrag.registrate.fabric.EnvExecutor;
99
import net.fabricmc.api.EnvType;
10+
import net.fabricmc.api.Environment;
1011
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
1112
import net.fabricmc.loader.api.FabricLoader;
1213
import net.minecraft.client.Minecraft;
14+
import net.minecraft.client.particle.ParticleEngine;
1315
import net.minecraft.core.particles.ParticleOptions;
1416
import net.minecraft.nbt.CompoundTag;
1517
import net.minecraft.network.chat.Component;
@@ -42,7 +44,7 @@ public static void getEnvExecutor(Supplier<Runnable> toRun){
4244
}
4345

4446
public static <D extends ParticleOptions> void registerParticleOnPlatform(ClockworkParticles.ParticleEntry<D> particleEntry, @Nullable Object event) {
45-
particleEntry.registerFactory(Minecraft.getInstance().particleEngine);
47+
particleEntry.typeFactory.get().register(particleEntry.object, Minecraft.getInstance().particleEngine);
4648
}
4749

4850
public static double getReachDistance(Player player) {

forge/src/main/java/org/valkyrienskies/clockwork/forge/ClockworkModForge.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ public ClockworkModForge(FMLJavaModLoadingContext context) {
5555
ClockworkEntities.register();
5656
ForgeClockworkEntities.register();
5757

58-
modEventBus.addListener((RegisterParticleProvidersEvent event) -> ClockworkParticles.initClient(event));
58+
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
59+
modEventBus.addListener((RegisterParticleProvidersEvent event) -> ClockworkParticles.initClient(event));
60+
});
5961

6062
//AllClockworkConfigs.register(modLoadingContext);
6163

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.daemon=false
55
# Identity
66
mod_name=clockwork
77
mod_id=vs_clockwork
8-
mod_version=0.5.4
8+
mod_version=0.5.4.1
99
archives_base_name=clockwork
1010
maven_group=org.valkyrienskies
1111

@@ -25,7 +25,7 @@ parchment_version = 2023.09.03
2525
vs2_version=2.4.4+d4cc6ad3ef
2626
vscore_version=1.1.0+629097feb1
2727
# Kelvin
28-
kelvin_version=0.4.0+15341cebfa
28+
kelvin_version=0.4.0+ad27706cf1
2929

3030
# Fabric
3131
# https://fabricmc.net/develop/

0 commit comments

Comments
 (0)