mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Fix a ton of side safety issues
This commit is contained in:
1 parent
2fea94a85d
commit
7ffdc27c49
13 files changed
+99
-63
No files matched your search
@@ -122,7 +122,7 @@ public final class TooltipAdditionDisplayHandler {
|
||||
Botania.proxy.setEntryToOpen(data.entry);
|
||||
Botania.proxy.setLexiconStack(lexiconStack);
|
||||
mc.player.closeScreen();
|
||||
ItemLexicon.openBook(mc.player, lexiconStack, mc.world, false);
|
||||
// todo 1.14 remove all this
|
||||
|
||||
}
|
||||
} else lexiconLookupTime = 0F;
|
||||
|
||||
@@ -30,8 +30,8 @@ public class ModParticles {
|
||||
public static class FactoryHandler {
|
||||
@SubscribeEvent
|
||||
public static void registerFactories(ParticleFactoryRegisterEvent evt) {
|
||||
Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, WispParticleType.FACTORY);
|
||||
Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, SparkleParticleType.FACTORY);
|
||||
Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, new WispParticleType.Factory());
|
||||
Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, new SparkleParticleType.Factory());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,21 @@
|
||||
package vazkii.botania.client.fx;
|
||||
|
||||
import net.minecraft.client.particle.IParticleFactory;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.particles.ParticleType;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class SparkleParticleType extends ParticleType<SparkleParticleData> {
|
||||
public SparkleParticleType() {
|
||||
super(false, SparkleParticleData.DESERIALIZER);
|
||||
}
|
||||
|
||||
public static IParticleFactory<SparkleParticleData> FACTORY =
|
||||
(data, world, x, y, z, xSpeed, ySpeed, zSpeed)
|
||||
-> new FXSparkle(world, x, y, z, data.size, data.r, data.g, data.b, data.m, data.fake, data.noClip, data.corrupt);
|
||||
public static class Factory implements IParticleFactory<SparkleParticleData> {
|
||||
@Override
|
||||
public Particle makeParticle(SparkleParticleData data, World world, double x, double y, double z, double mx, double my, double mz) {
|
||||
return new FXSparkle(world, x, y, z, data.size, data.r, data.g, data.b, data.m, data.fake, data.noClip, data.corrupt);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,21 @@
|
||||
package vazkii.botania.client.fx;
|
||||
|
||||
import net.minecraft.client.particle.IParticleFactory;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.particles.ParticleType;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class WispParticleType extends ParticleType<WispParticleData> {
|
||||
public WispParticleType() {
|
||||
super(false, WispParticleData.DESERIALIZER);
|
||||
}
|
||||
|
||||
public static IParticleFactory<WispParticleData> FACTORY =
|
||||
(data, world, x, y, z, xSpeed, ySpeed, zSpeed) ->
|
||||
new FXWisp(world, x, y, z, xSpeed, ySpeed, zSpeed, data.size, data.r, data.g, data.b, data.depthTest, data.maxAgeMul);
|
||||
public static class Factory implements IParticleFactory<WispParticleData> {
|
||||
@Override
|
||||
public Particle makeParticle(WispParticleData data, World world, double x, double y, double z, double mx, double my, double mz) {
|
||||
return new FXWisp(world, x, y, z, mx, my, mz, data.size, data.r, data.g, data.b, data.depthTest, data.maxAgeMul);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,8 +22,11 @@ import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import net.minecraftforge.registries.IForgeRegistryEntry;
|
||||
@@ -622,10 +625,6 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockPool(dilutedPool, props), dilutedPool.getRegistryName());
|
||||
register(r, new ItemBlockPool(fabulousPool, props), fabulousPool.getRegistryName());
|
||||
register(r, new ItemBlockMod(runeAltar, props), runeAltar.getRegistryName());
|
||||
Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> RenderTilePylon.TEISR::new);
|
||||
register(r, new ItemBlockMod(manaPylon, pylonProps), manaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(naturaPylon, pylonProps), naturaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(gaiaPylon, pylonProps), gaiaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(pistonRelay, props), pistonRelay.getRegistryName());
|
||||
register(r, new ItemBlockMod(distributor, props), distributor.getRegistryName());
|
||||
register(r, new ItemBlockMod(manaVoid, props), manaVoid.getRegistryName());
|
||||
@@ -711,7 +710,6 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockMod(starfield, props), starfield.getRegistryName());
|
||||
register(r, new ItemBlockMod(rfGenerator, props), rfGenerator.getRegistryName());
|
||||
register(r, new ItemBlockElven(elfGlass, props), elfGlass.getRegistryName());
|
||||
register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))), brewery.getRegistryName());
|
||||
register(r, new ItemBlockMod(manaGlass, props), manaGlass.getRegistryName());
|
||||
register(r, new ItemBlockMod(terraPlate, props), terraPlate.getRegistryName());
|
||||
register(r, new ItemBlockMod(redStringContainer, props), redStringContainer.getRegistryName());
|
||||
@@ -737,7 +735,6 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockMod(petalBlockGreen, props), petalBlockGreen.getRegistryName());
|
||||
register(r, new ItemBlockMod(petalBlockRed, props), petalBlockRed.getRegistryName());
|
||||
register(r, new ItemBlockMod(petalBlockBlack, props), petalBlockBlack.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))), corporeaIndex.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaFunnel, props), corporeaFunnel.getRegistryName());
|
||||
register(r, new ItemBlockMod(whiteMushroom, props), whiteMushroom.getRegistryName());
|
||||
register(r, new ItemBlockMod(orangeMushroom, props), orangeMushroom.getRegistryName());
|
||||
@@ -774,9 +771,7 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockMod(doubleFlowerBlack, props), doubleFlowerBlack.getRegistryName());
|
||||
register(r, new ItemBlockBlaze(blazeBlock, props), blazeBlock.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaInterceptor, props), corporeaInterceptor.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))), corporeaCrystalCube.getRegistryName());
|
||||
register(r, new ItemBlockMod(incensePlate, props), incensePlate.getRegistryName());
|
||||
register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))), hourglass.getRegistryName());
|
||||
register(r, new ItemBlockMod(ghostRail, props), ghostRail.getRegistryName());
|
||||
register(r, new ItemBlockMod(sparkChanger, props), sparkChanger.getRegistryName());
|
||||
register(r, new ItemBlockMod(root, props), root.getRegistryName());
|
||||
@@ -789,15 +784,12 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockMod(lightLauncher, props), lightLauncher.getRegistryName());
|
||||
register(r, new ItemBlockMod(manaBomb, props), manaBomb.getRegistryName());
|
||||
register(r, new ItemBlockMod(cacophonium, props), cacophonium.getRegistryName());
|
||||
register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))), bellows.getRegistryName());
|
||||
register(r, new ItemBlockMod(bifrostPerm, props), bifrostPerm.getRegistryName());
|
||||
register(r, new ItemBlockMod(cellBlock, props), cellBlock.getRegistryName());
|
||||
register(r, new ItemBlockMod(redStringInterceptor, props), redStringInterceptor.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaRetainer, props), corporeaRetainer.getRegistryName());
|
||||
register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))), teruTeruBozu.getRegistryName());
|
||||
register(r, new ItemBlockMod(shimmerrock, props), shimmerrock.getRegistryName());
|
||||
register(r, new ItemBlockMod(shimmerwoodPlanks, props), shimmerwoodPlanks.getRegistryName());
|
||||
register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))), avatar.getRegistryName());
|
||||
register(r, new ItemBlockMod(dryGrass, props), dryGrass.getRegistryName());
|
||||
register(r, new ItemBlockMod(goldenGrass, props), goldenGrass.getRegistryName());
|
||||
register(r, new ItemBlockMod(vividGrass, props), vividGrass.getRegistryName());
|
||||
@@ -805,6 +797,44 @@ public final class ModBlocks {
|
||||
register(r, new ItemBlockMod(infusedGrass, props), infusedGrass.getRegistryName());
|
||||
register(r, new ItemBlockMod(mutatedGrass, props), mutatedGrass.getRegistryName());
|
||||
register(r, new ItemBlockMod(animatedTorch, props), animatedTorch.getRegistryName());
|
||||
|
||||
DistExecutor.runForDist(() -> () -> registerWithTEISRS(r), () -> () -> registerWithoutTEISRS(r));
|
||||
}
|
||||
|
||||
// Yay side-safety -.-
|
||||
|
||||
@OnlyIn(Dist.DEDICATED_SERVER)
|
||||
private static Void registerWithoutTEISRS(IForgeRegistry<Item> r) {
|
||||
Item.Properties props = ModItems.defaultBuilder();
|
||||
register(r, new ItemBlockMod(manaPylon, props), manaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(naturaPylon, props), naturaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(gaiaPylon, props), gaiaPylon.getRegistryName());
|
||||
|
||||
register(r, new ItemBlockMod(teruTeruBozu, props), teruTeruBozu.getRegistryName());
|
||||
register(r, new ItemBlockMod(avatar, props), avatar.getRegistryName());
|
||||
register(r, new ItemBlockMod(bellows, props), bellows.getRegistryName());
|
||||
register(r, new ItemBlockMod(brewery, props), brewery.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaCrystalCube, props), corporeaCrystalCube.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaIndex, props), corporeaIndex.getRegistryName());
|
||||
register(r, new ItemBlockMod(hourglass, props), hourglass.getRegistryName());
|
||||
return null;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
private static Void registerWithTEISRS(IForgeRegistry<Item> r) {
|
||||
Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> () -> new RenderTilePylon.TEISR());
|
||||
register(r, new ItemBlockMod(manaPylon, pylonProps), manaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(naturaPylon, pylonProps), naturaPylon.getRegistryName());
|
||||
register(r, new ItemBlockMod(gaiaPylon, pylonProps), gaiaPylon.getRegistryName());
|
||||
|
||||
register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))), teruTeruBozu.getRegistryName());
|
||||
register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))), avatar.getRegistryName());
|
||||
register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))), bellows.getRegistryName());
|
||||
register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))), brewery.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))), corporeaCrystalCube.getRegistryName());
|
||||
register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))), corporeaIndex.getRegistryName());
|
||||
register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))), hourglass.getRegistryName());
|
||||
return null;
|
||||
}
|
||||
|
||||
public static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, ResourceLocation name) {
|
||||
|
||||
@@ -25,6 +25,8 @@ import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.EntityRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.network.NetworkHooks;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -36,6 +38,10 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@OnlyIn(
|
||||
value = Dist.CLIENT,
|
||||
_interface = IRendersAsItem.class
|
||||
)
|
||||
public class EntityEnderAirBottle extends ThrowableEntity implements IRendersAsItem {
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":ender_air_bottle")
|
||||
public static EntityType<EntityEnderAirBottle> TYPE;
|
||||
|
||||
@@ -36,6 +36,8 @@ import net.minecraft.util.math.EntityRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.network.NetworkHooks;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
@@ -44,6 +46,10 @@ import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@OnlyIn(
|
||||
value = Dist.CLIENT,
|
||||
_interface = IRendersAsItem.class
|
||||
)
|
||||
public class EntityThornChakram extends ThrowableEntity implements IRendersAsItem {
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":thorn_chakram")
|
||||
public static EntityType<EntityThornChakram> TYPE;
|
||||
|
||||
@@ -43,6 +43,10 @@ import vazkii.botania.common.lib.LibMisc;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Map;
|
||||
|
||||
@OnlyIn(
|
||||
value = Dist.CLIENT,
|
||||
_interface = IRendersAsItem.class
|
||||
)
|
||||
public class EntityVineBall extends ThrowableEntity implements IRendersAsItem {
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":vine_ball")
|
||||
public static EntityType<EntityVineBall> TYPE;
|
||||
|
||||
@@ -138,29 +138,6 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
|
||||
}
|
||||
}
|
||||
|
||||
public static void openBook(PlayerEntity player, ItemStack stack, World world, boolean skipSound) {
|
||||
ILexicon l = (ILexicon) stack.getItem();
|
||||
|
||||
Botania.proxy.setToTutorialIfFirstLaunch();
|
||||
|
||||
if(!l.isKnowledgeUnlocked(stack, BotaniaAPI.relicKnowledge) && l.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge))
|
||||
for(Item item : ItemDice.getRelics()) {
|
||||
if(PlayerHelper.hasItem(player, s -> s != null && s.getItem() == item)) {
|
||||
l.unlockKnowledge(stack, BotaniaAPI.relicKnowledge);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Botania.proxy.setLexiconStack(stack);
|
||||
if(world.isRemote)
|
||||
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().displayGuiScreen(GuiLexicon.currentOpenLexicon));
|
||||
if(!world.isRemote) {
|
||||
if(!skipSound)
|
||||
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F);
|
||||
UseItemSuccessTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack, (ServerWorld) world, player.posX, player.posY, player.posZ);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void inventoryTick(ItemStack stack, World world, Entity entity, int idk, boolean something) {
|
||||
int ticks = getQueueTicks(stack);
|
||||
|
||||
@@ -21,9 +21,11 @@ import net.minecraft.item.crafting.IRecipeSerializer;
|
||||
import net.minecraft.potion.EffectInstance;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.common.extensions.IForgeContainerType;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
@@ -750,11 +752,14 @@ public final class ModItems {
|
||||
|
||||
ContainerType<ContainerFlowerBag> bag = IForgeContainerType.create(ContainerFlowerBag::fromNetwork);
|
||||
register(r, bag, flowerBag.getRegistryName());
|
||||
ScreenManager.registerFactory(bag, GuiFlowerBag::new);
|
||||
|
||||
ContainerType<ContainerBaubleBox> box = IForgeContainerType.create(ContainerBaubleBox::fromNetwork);
|
||||
register(r, box, baubleBox.getRegistryName());
|
||||
ScreenManager.registerFactory(box, GuiBaubleBox::new);
|
||||
|
||||
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
|
||||
ScreenManager.registerFactory(bag, GuiFlowerBag::new);
|
||||
ScreenManager.registerFactory(box, GuiBaubleBox::new);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.item.AccessoryRenderHelper;
|
||||
import vazkii.botania.api.mana.IManaUsingItem;
|
||||
@@ -85,7 +84,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
public ItemFlightTiara(Properties props) {
|
||||
super(props);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::updatePlayerFlyStatus);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::playerLoggedOut);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -106,8 +106,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
stacks.add(new TranslationTextComponent("botania.wings" + ItemNBTHelper.getInt(stack, TAG_VARIANT, 0)));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void updatePlayerFlyStatus(LivingUpdateEvent event) {
|
||||
private void updatePlayerFlyStatus(LivingUpdateEvent event) {
|
||||
if(event.getEntityLiving() instanceof PlayerEntity) {
|
||||
PlayerEntity player = (PlayerEntity) event.getEntityLiving();
|
||||
ItemStack tiara = EquipmentHandler.findOrEmpty(ModItems.flightTiara, player);
|
||||
@@ -199,8 +198,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||
private void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||
String username = event.getPlayer().getGameProfile().getName();
|
||||
playersWithFlight.remove(username + ":false");
|
||||
playersWithFlight.remove(username + ":true");
|
||||
|
||||
@@ -24,7 +24,6 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import vazkii.botania.api.item.AccessoryRenderHelper;
|
||||
import vazkii.botania.api.mana.IManaUsingItem;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
@@ -51,7 +50,9 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
public ItemTravelBelt(Properties props) {
|
||||
this(props, 0.035F, 0.2F, 2F);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::updatePlayerStepStatus);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::onPlayerJump);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::playerLoggedOut);
|
||||
}
|
||||
|
||||
public ItemTravelBelt(Properties props, float speed, float jump, float fallBuffer) {
|
||||
@@ -61,8 +62,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
|
||||
this.fallBuffer = fallBuffer;
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void updatePlayerStepStatus(LivingUpdateEvent event) {
|
||||
private void updatePlayerStepStatus(LivingUpdateEvent event) {
|
||||
if(event.getEntityLiving() instanceof PlayerEntity) {
|
||||
PlayerEntity player = (PlayerEntity) event.getEntityLiving();
|
||||
ItemStack belt = EquipmentHandler.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player);
|
||||
@@ -106,8 +106,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
public void onNotMovingTick(ItemStack stack, PlayerEntity player) {}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerJump(LivingJumpEvent event) {
|
||||
private void onPlayerJump(LivingJumpEvent event) {
|
||||
if(event.getEntityLiving() instanceof PlayerEntity) {
|
||||
PlayerEntity player = (PlayerEntity) event.getEntityLiving();
|
||||
ItemStack belt = EquipmentHandler.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player);
|
||||
@@ -124,8 +123,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
|
||||
return !result.isEmpty() && ManaItemHandler.requestManaExact(result, player, COST, false);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||
private void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||
String username = event.getPlayer().getGameProfile().getName();
|
||||
playersWithStepup.remove(username + ":false");
|
||||
playersWithStepup.remove(username + ":true");
|
||||
|
||||
+2
-4
@@ -25,7 +25,6 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.dimension.DimensionType;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.item.ISequentialBreaker;
|
||||
import vazkii.botania.common.item.ItemTemperanceStone;
|
||||
@@ -78,7 +77,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
|
||||
|
||||
public ItemTerraAxe(Properties props) {
|
||||
super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::onTickEnd);
|
||||
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), (stack, world, entity) -> {
|
||||
if(entity instanceof PlayerEntity && !shouldBreak((PlayerEntity) entity))
|
||||
return 0;
|
||||
@@ -119,8 +118,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
|
||||
return false;
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTickEnd(TickEvent.WorldTickEvent event) {
|
||||
private void onTickEnd(TickEvent.WorldTickEvent event) {
|
||||
// Block Swapping ticking should only occur on the server
|
||||
if(event.world.isRemote)
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user