icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
gnembon committed 2020-06-10 01:51:26 -03:00
1 parent 9aa580cfa5
commit bca8c2bb3c
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
+1 -1
View File
@@ -8,8 +8,8 @@ import net.minecraft.client.render.Camera;
import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.LightmapTextureManager; import net.minecraft.client.render.LightmapTextureManager;
import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.util.math.Matrix4f;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.Matrix4f;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
src/main/java/carpet/script/utils/ShapeDispatcher.java
+4 -4
View File
@@ -88,7 +88,7 @@ public class ShapeDispatcher
for (int i=2; i < lv.size(); i++) paramList.add(lv.get(i)); for (int i=2; i < lv.size(); i++) paramList.add(lv.get(i));
params = ShapeDispatcher.parseParams(paramList); params = ShapeDispatcher.parseParams(paramList);
} }
params.putIfAbsent("dim", new StringValue(cc.s.getWorld().getDimension().getType().toString())); params.putIfAbsent("dim", new StringValue(cc.s.getWorld().getRegistryKey().getValue().toString()));
params.putIfAbsent("duration", duration); params.putIfAbsent("duration", duration);
if (params.containsKey("player")) if (params.containsKey("player"))
@@ -413,7 +413,7 @@ public class ShapeDispatcher
double density = Math.max(2.0, from.distanceTo(to) /50) / (a+0.1); double density = Math.max(2.0, from.distanceTo(to) /50) / (a+0.1);
return p -> return p ->
{ {
if (p.dimension == shapeDimension) if (p.world.getRegistryKey() == shapeDimension)
{ {
particleMesh( particleMesh(
Collections.singletonList(p), Collections.singletonList(p),
@@ -498,7 +498,7 @@ public class ShapeDispatcher
return p -> return p ->
{ {
if (p.dimension == shapeDimension) drawParticleLine( if (p.world.getRegistryKey() == shapeDimension) drawParticleLine(
Collections.singletonList(p), Collections.singletonList(p),
particle, particle,
relativiseRender(p.getServerWorld(), from, 0), relativiseRender(p.getServerWorld(), from, 0),
@@ -555,7 +555,7 @@ public class ShapeDispatcher
@Override @Override
public Consumer<ServerPlayerEntity> alternative() { return p -> public Consumer<ServerPlayerEntity> alternative() { return p ->
{ {
if (p.dimension != shapeDimension) return; if (p.world.getRegistryKey() != shapeDimension) return;
String particleName = String.format(Locale.ROOT , "dust %.1f %.1f %.1f 1.0", r, g, b); String particleName = String.format(Locale.ROOT , "dust %.1f %.1f %.1f 1.0", r, g, b);
ParticleEffect particle = getParticleData(particleName); ParticleEffect particle = getParticleData(particleName);
int partno = Math.min(1000,20*subdivisions); int partno = Math.min(1000,20*subdivisions);