Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add force horse riding event #77

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/me/juancarloscp52/entropy/Variables.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ public class Variables {
public static boolean xrayActive = false;
public static float cameraRoll = 0f;
public static boolean stuttering = false;
public static boolean forceRiding = false;
}
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public static void register() {
entropyEvents.put("ConstantInteractingEvent", ConstantInteractingEvent::new);
entropyEvents.put("MLGBucketEvent", MLGBucketEvent::new);
entropyEvents.put("StutteringEvent", StutteringEvent::new);
entropyEvents.put("ForceHorseRidingEvent", ForceHorseRidingEvent::new);

}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package me.juancarloscp52.entropy.events.db;

import java.util.ArrayList;
import java.util.List;

import me.juancarloscp52.entropy.Entropy;
import me.juancarloscp52.entropy.Variables;
import me.juancarloscp52.entropy.events.AbstractTimedEvent;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnReason;
import net.minecraft.entity.passive.HorseEntity;
import net.minecraft.sound.SoundCategory;

public class ForceHorseRidingEvent extends AbstractTimedEvent {
private List<HorseEntity> spawnedHorses = new ArrayList<>();

@Override
public void initClient() {
Variables.forceRiding = true;
}

@Override
public void init() {
Entropy.getInstance().eventHandler.getActivePlayers().forEach(player -> {
spawnedHorses.add(EntityType.HORSE.spawn(player.getWorld(), null, horse -> {
horse.bondWithPlayer(player);
horse.saddle(SoundCategory.NEUTRAL);
player.startRiding(horse);
}, player.getBlockPos(), SpawnReason.SPAWN_EGG, false, false));
});
Variables.forceRiding = true;
}

@Override
public void endClient() {
super.endClient();
Variables.forceRiding = false;
}

@Override
public void end() {
super.end();
Variables.forceRiding = false;
spawnedHorses.forEach(Entity::discard);
}

@Override
public void render(MatrixStack matrixStack, float tickdelta) {}

@Override
public short getDuration() {
return Entropy.getInstance().settings.baseEventDuration;
}
}
16 changes: 16 additions & 0 deletions src/main/java/me/juancarloscp52/entropy/mixin/EntityMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(Entity.class)
Expand All @@ -37,6 +38,9 @@ public abstract class EntityMixin {
@Shadow
public World world;

@Shadow
private Entity vehicle;

@Shadow
public abstract double getX();

Expand All @@ -46,6 +50,18 @@ public abstract class EntityMixin {
@Shadow
public abstract double getZ();

@Inject(method = "Lnet/minecraft/entity/Entity;startRiding(Lnet/minecraft/entity/Entity;Z)Z", at = @At("HEAD"), cancellable = true)
private void preventMounting(Entity entityToMount, boolean force, CallbackInfoReturnable<Boolean> cir) {
if(Variables.forceRiding && vehicle != null)
cir.setReturnValue(false);
}

@Inject(method = "dismountVehicle", at = @At("HEAD"), cancellable = true)
private void preventDismounting(CallbackInfo ci) {
if(Variables.forceRiding)
ci.cancel();
}

@Inject(method = "dropStack(Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;", at = @At("HEAD"), cancellable = true)
private void randomDrops(ItemStack stack, float yOffset, CallbackInfoReturnable<ItemEntity> cir) {
if (Variables.noDrops) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/de_at.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"entropy.events.ConstantInteractingEvent": "Ich kann nicht aufhören zu interagieren!",
"entropy.events.MLGBucketEvent": "MLG-Wassereimer",
"entropy.events.StutteringEvent": "Gestotter",
"entropy.events.ForceHorseRidingEvent": "Es ist Zeit zum Pferdereiten!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy Fehler",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/de_ch.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"entropy.events.ConstantInteractingEvent": "Ich kann nicht aufhören zu interagieren!",
"entropy.events.MLGBucketEvent": "MLG-Wassereimer",
"entropy.events.StutteringEvent": "Gestotter",
"entropy.events.ForceHorseRidingEvent": "Es ist Zeit zum Pferdereiten!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy Fehler",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"entropy.events.ConstantInteractingEvent": "Ich kann nicht aufhören zu interagieren!",
"entropy.events.MLGBucketEvent": "MLG-Wassereimer",
"entropy.events.StutteringEvent": "Gestotter",
"entropy.events.ForceHorseRidingEvent": "Es ist Zeit zum Pferdereiten!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy Fehler",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/en_gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"entropy.events.ConstantInteractingEvent": "I can't stop interacting!",
"entropy.events.MLGBucketEvent": "MLG water bucket",
"entropy.events.StutteringEvent": "Stuttering",
"entropy.events.ForceHorseRidingEvent": "It's horse riding time!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy Error",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
"entropy.events.ConstantInteractingEvent": "I can't stop interacting!",
"entropy.events.MLGBucketEvent": "MLG Water Bucket",
"entropy.events.StutteringEvent": "Stuttering",
"entropy.events.ForceHorseRidingEvent": "It's Horse Riding Time!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy Error",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/entropy/lang/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"entropy.events.NoUseKeyEvent": "Prohibido interactuar",
"entropy.events.ConstantInteractingEvent": "¡No puedo dejar de interactuar!",
"entropy.events.MLGBucketEvent": "Caída en agua (waterdrop)",
"entropy.events.ForceHorseRidingEvent": "¡Hora de montar a caballo!",

"entropy.title": "Entropy: Chaos Mod",
"entropy.errorScreen.title": "Entropy error",
Expand Down