Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-14 23:13:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

PR datagen

Browse source
This commit is contained in:
simibubi 2022-07-11 22:55:09 +02:00
parent a5903c11d6
commit 9e8b278398
4 changed files with 1062 additions and 1057 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/generated/resources/.cache/cache
View file

@ -572,7 +572,7 @@ fb68a89d423ef73d9204e6d75b7e2b3ae21daad7 assets/create/lang/unfinished/nl_nl.jso
9cc304bfe85f01592077a84135962d8478999384 assets/create/lang/unfinished/pt_br.json 9cc304bfe85f01592077a84135962d8478999384 assets/create/lang/unfinished/pt_br.json
1252dc9c586fd55e80cd838aeb60932fc29c4e92 assets/create/lang/unfinished/pt_pt.json 1252dc9c586fd55e80cd838aeb60932fc29c4e92 assets/create/lang/unfinished/pt_pt.json
42d9d2510ee559254fe6683c7ac07c6a018820c0 assets/create/lang/unfinished/ro_ro.json 42d9d2510ee559254fe6683c7ac07c6a018820c0 assets/create/lang/unfinished/ro_ro.json
88ec38d3d79584e2f5d6b3134c1c68514c33d790 assets/create/lang/unfinished/ru_ru.json ad92bbff37632e230d1736cf2be1220dcef8dc19 assets/create/lang/unfinished/ru_ru.json
e4da496b24c1fa434e9ed43dfa5c8945446dd5a2 assets/create/lang/unfinished/zh_cn.json e4da496b24c1fa434e9ed43dfa5c8945446dd5a2 assets/create/lang/unfinished/zh_cn.json
9756888c28dbc5358b4a80bdb7f85a9cafffa53e assets/create/lang/unfinished/zh_tw.json 9756888c28dbc5358b4a80bdb7f85a9cafffa53e assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json

2108
src/generated/resources/assets/create/lang/unfinished/ru_ru.json
View file

File diff suppressed because it is too large Load diff

7
src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java
View file

@ -21,6 +21,7 @@ import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.TamableAnimal;
import net.minecraft.world.entity.monster.Shulker;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;
@ -181,7 +182,11 @@ public class SeatBlock extends Block implements ProperWaterloggedBlock {
} }
public static boolean canBePickedUp(Entity passenger) { public static boolean canBePickedUp(Entity passenger) {
return !(passenger instanceof Player) && (passenger instanceof LivingEntity); if (passenger instanceof Shulker)
return false;
if (passenger instanceof Player)
return false;
return passenger instanceof LivingEntity;
} }
public static void sitDown(Level world, BlockPos pos, Entity entity) { public static void sitDown(Level world, BlockPos pos, Entity entity) {

2
src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlock.java
View file

@ -113,7 +113,7 @@ public class StationBlock extends Block implements ITE<StationTileEntity>, IWren
public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand,
BlockHitResult pHit) { BlockHitResult pHit) {
if (pPlayer == null) if (pPlayer == null || pPlayer.isSteppingCarefully())
return InteractionResult.PASS; return InteractionResult.PASS;
ItemStack itemInHand = pPlayer.getItemInHand(pHand); ItemStack itemInHand = pPlayer.getItemInHand(pHand);
if (AllItems.WRENCH.isIn(itemInHand)) if (AllItems.WRENCH.isIn(itemInHand))