fix boat inputs allowing to move
and also removes the import in the api
This commit is contained in:
parent
8c4c64d559
commit
d7412bb750
|
@ -7,10 +7,9 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package biomesoplenty.api.entity;
|
package biomesoplenty.api.entity;
|
||||||
|
|
||||||
import biomesoplenty.common.entity.item.BoatEntityBOP;
|
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
|
|
||||||
public class BOPEntities
|
public class BOPEntities
|
||||||
{
|
{
|
||||||
public static EntityType<BoatEntityBOP> boat_bop;
|
public static EntityType<?> boat_bop;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import biomesoplenty.api.item.BOPItems;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.LilyPadBlock;
|
import net.minecraft.block.LilyPadBlock;
|
||||||
|
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.entity.LivingEntity;
|
import net.minecraft.entity.LivingEntity;
|
||||||
|
@ -37,12 +38,19 @@ import net.minecraft.world.GameRules;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.LogicalSide;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
import net.minecraftforge.fml.common.gameevent.TickEvent;
|
||||||
import net.minecraftforge.fml.network.FMLPlayMessages;
|
import net.minecraftforge.fml.network.FMLPlayMessages;
|
||||||
import net.minecraftforge.fml.network.NetworkHooks;
|
import net.minecraftforge.fml.network.NetworkHooks;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import static biomesoplenty.core.BiomesOPlenty.MOD_ID;
|
||||||
|
|
||||||
|
@Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
|
||||||
public class BoatEntityBOP extends Entity {
|
public class BoatEntityBOP extends Entity {
|
||||||
private static final DataParameter<Integer> TIME_SINCE_HIT = EntityDataManager.createKey(BoatEntityBOP.class, DataSerializers.VARINT);
|
private static final DataParameter<Integer> TIME_SINCE_HIT = EntityDataManager.createKey(BoatEntityBOP.class, DataSerializers.VARINT);
|
||||||
private static final DataParameter<Integer> FORWARD_DIRECTION = EntityDataManager.createKey(BoatEntityBOP.class, DataSerializers.VARINT);
|
private static final DataParameter<Integer> FORWARD_DIRECTION = EntityDataManager.createKey(BoatEntityBOP.class, DataSerializers.VARINT);
|
||||||
|
@ -76,7 +84,7 @@ public class BoatEntityBOP extends Entity {
|
||||||
private float rockingAngle;
|
private float rockingAngle;
|
||||||
private float prevRockingAngle;
|
private float prevRockingAngle;
|
||||||
|
|
||||||
public BoatEntityBOP(EntityType<BoatEntityBOP> p_i50129_1_, World p_i50129_2_) {
|
public BoatEntityBOP(EntityType<?> p_i50129_1_, World p_i50129_2_) {
|
||||||
super(p_i50129_1_, p_i50129_2_);
|
super(p_i50129_1_, p_i50129_2_);
|
||||||
this.preventEntitySpawning = true;
|
this.preventEntitySpawning = true;
|
||||||
}
|
}
|
||||||
|
@ -94,6 +102,15 @@ public class BoatEntityBOP extends Entity {
|
||||||
this(BOPEntities.boat_bop, world);
|
this(BOPEntities.boat_bop, world);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onRidden(TickEvent.PlayerTickEvent event) {
|
||||||
|
if (event.side == LogicalSide.CLIENT && event.phase == TickEvent.Phase.START && event.player.getRidingEntity() instanceof BoatEntityBOP) {
|
||||||
|
ClientPlayerEntity player = (ClientPlayerEntity) event.player;
|
||||||
|
((BoatEntityBOP)event.player.getRidingEntity()).updateInputs(player.movementInput.leftKeyDown, player.movementInput.rightKeyDown, player.movementInput.forwardKeyDown, player.movementInput.backKeyDown);
|
||||||
|
player.rowingBoat |= player.movementInput.leftKeyDown || player.movementInput.rightKeyDown || player.movementInput.forwardKeyDown || player.movementInput.backKeyDown;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
|
* returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
|
||||||
* prevent them from trampling crops
|
* prevent them from trampling crops
|
||||||
|
|
|
@ -16,3 +16,5 @@ public-f net.minecraft.item.AxeItem field_203176_a # BLOCK_STRIPPING_MAP
|
||||||
# server.properties world type hackery
|
# server.properties world type hackery
|
||||||
public-f net.minecraft.server.dedicated.ServerProperties *
|
public-f net.minecraft.server.dedicated.ServerProperties *
|
||||||
public net.minecraft.server.dedicated.PropertyManager *
|
public net.minecraft.server.dedicated.PropertyManager *
|
||||||
|
|
||||||
|
public net.minecraft.client.entity.player.ClientPlayerEntity field_184844_co # rowingBoat
|
||||||
|
|
Loading…
Reference in New Issue