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

fixed te fillUpdates and client call fix. better camera

Browse Source
This commit is contained in:
gnembon committed 2019-12-18 10:41:03 -04:00
1 parent 9ba573afe6
commit 9457ce741c
3 files changed
+6 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java
-10
View File
@@ -21,14 +21,4 @@ public class WorldChunk_fillUpdatesMixin
if (!CarpetSettings.impendingFillSkipUpdates) if (!CarpetSettings.impendingFillSkipUpdates)
blockState.onBlockAdded(world_1, blockPos_1, blockState_1, boolean_1); blockState.onBlockAdded(world_1, blockPos_1, blockState_1, boolean_1);
} }
@Redirect(method = "setBlockState", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/block/BlockState;onBlockRemoved(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V"
))
private void onRemoved(BlockState blockState, World world_1, BlockPos blockPos_1, BlockState blockState_1, boolean boolean_1)
{
if (!CarpetSettings.impendingFillSkipUpdates)
blockState.onBlockRemoved(world_1, blockPos_1, blockState_1, boolean_1);
}
} }
src/main/java/carpet/script/value/EntityValue.java
+1 -1
View File
@@ -223,7 +223,7 @@ public class EntityValue extends Value
put("dimension", (e, a) -> new StringValue(nameFromRegistryId(Registry.DIMENSION.getId(e.dimension)))); put("dimension", (e, a) -> new StringValue(nameFromRegistryId(Registry.DIMENSION.getId(e.dimension))));
put("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height)); put("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height));
put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width)); put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width));
put("eye_height", (e, a) -> new NumericValue(e.getEyeHeight(EntityPose.STANDING))); put("eye_height", (e, a) -> new NumericValue(e.getStandingEyeHeight()));
put("age", (e, a) -> new NumericValue(e.age)); put("age", (e, a) -> new NumericValue(e.age));
put("despawn_timer", (e, a) -> e instanceof LivingEntity?new NumericValue(((LivingEntity) e).getDespawnCounter()):Value.NULL); put("despawn_timer", (e, a) -> e instanceof LivingEntity?new NumericValue(((LivingEntity) e).getDespawnCounter()):Value.NULL);
put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL); put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL);
src/main/resources/assets/carpet/scripts/camera.sc
+5 -4
View File
@@ -153,8 +153,9 @@ play(fps) ->
p = player(); p = player();
__assert_valid_for_motion(); __assert_valid_for_motion();
__prepare_path_if_needed(); __prepare_path_if_needed();
if ((fps % 20 != 0) || fps < 20, exit('FPS needs to be multiples of 20') ); task( _(outer(fps), outer(p)) -> (
tpt = round(fps / 20); //if ((fps % 20 != 0) || fps < 20, exit('FPS needs to be multiples of 20') );
tpt = fps / 20;
mspt = 50 / tpt; mspt = 50 / tpt;
start_time = time(); start_time = time();
point = 0; point = 0;
@@ -166,15 +167,15 @@ play(fps) ->
v = __get_path_at(segment, start, _); v = __get_path_at(segment, start, _);
modify(p, 'location', v); modify(p, 'location', v);
point += 1; point += 1;
if ((point % tpt == 0), game_tick());
end_time = time(); end_time = time();
took = end_time - start_time; took = end_time - start_time;
if (took < mspt, sleep(mspt-took)); if (took < mspt, sleep(mspt-took));
start_time = time() start_time = time()
) )
); );
game_tick(1000);
'Done!' 'Done!'
));
); );
_show_path_tick(particle_type, total) -> _show_path_tick(particle_type, total) ->
( (