Some advancements

This commit is contained in:
Vincent Lee committed 2017-06-29 20:12:04 -05:00
1 parent 797fd9257c
commit cf0819e9b9
8 files changed
+226 -2

No files matched your search

@@ -10,6 +10,8 @@
*/
package vazkii.botania.common;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.advancements.ICriterionTrigger;
import net.minecraft.entity.Entity;
import net.minecraft.entity.MultiPartEntityPart;
import net.minecraft.entity.boss.EntityDragon;
@@ -34,12 +36,14 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.ITwoNamedPage;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.common.advancement_triggers.UseLexiconTrigger;
import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
@@ -85,6 +89,8 @@ import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.world.SkyblockWorldEvents;
import vazkii.botania.common.world.WorldTypeSkyblock;
import java.lang.reflect.InvocationTargetException;
@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY)
public class Botania {
@@ -141,6 +147,11 @@ public class Botania {
ModManaInfusionRecipes.init();
ModElvenTradeRecipes.init();
ModBrewRecipes.init();
try {
ReflectionHelper.findMethod(CriteriaTriggers.class, "register", "", ICriterionTrigger.class).invoke(null, UseLexiconTrigger.INSTANCE); // todo 1.12 stop lazy use AT
} catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
}
// LexiconData.init(); todo 1.12
NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler());
@@ -0,0 +1,101 @@
package vazkii.botania.common.advancement_triggers;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import net.minecraft.advancements.ICriterionTrigger;
import net.minecraft.advancements.PlayerAdvancements;
import net.minecraft.advancements.critereon.AbstractCriterionInstance;
import net.minecraft.advancements.critereon.ItemPredicate;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
public class UseLexiconTrigger implements ICriterionTrigger<UseLexiconTrigger.Instance> {
public static final UseLexiconTrigger INSTANCE = new UseLexiconTrigger();
private static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "use_lexicon");
private final Map<PlayerAdvancements, ListenerSet> listeners = new HashMap<>();
private UseLexiconTrigger() {}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
@Override
public void addListener(@Nonnull PlayerAdvancements advancements, @Nonnull Listener<Instance> listener) {
listeners.computeIfAbsent(advancements, ListenerSet::new).listeners.add(listener);
}
@Override
public void removeListener(@Nonnull PlayerAdvancements advancements, @Nonnull Listener<Instance> listener) {
if (listeners.containsKey(advancements)) {
listeners.get(advancements).listeners.remove(listener);
if (listeners.get(advancements).listeners.isEmpty()) {
listeners.remove(advancements);
}
}
}
@Override
public void removeAllListeners(@Nonnull PlayerAdvancements advancements) {
listeners.remove(advancements);
}
@Nonnull
@Override
public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) {
return new Instance(ItemPredicate.deserialize(json.get("item")));
}
public void trigger(EntityPlayerMP player, ItemStack lexicon) {
ListenerSet set = listeners.get(player.getAdvancements());
if(set != null) {
set.trigger(player, lexicon);
}
}
public static class Instance extends AbstractCriterionInstance {
private final ItemPredicate item;
public Instance(ItemPredicate item) {
super(ID);
this.item = item;
}
public boolean test(ItemStack lexicon) {
return item.test(lexicon);
}
}
public static class ListenerSet {
private final PlayerAdvancements advancements;
private final Set<Listener<Instance>> listeners = new HashSet<>();
public ListenerSet(PlayerAdvancements advancements) {
this.advancements = advancements;
}
public void trigger(EntityPlayerMP player, ItemStack lexicon) {
List<Listener<Instance>> toTrigger = listeners.stream()
.filter(l -> l.getCriterionInstance().test(lexicon))
.collect(Collectors.toList());
for (ICriterionTrigger.Listener<Instance> listener : toTrigger) {
listener.grantCriterion(advancements);
}
}
}
}
@@ -19,6 +19,7 @@ import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -45,6 +46,7 @@ import vazkii.botania.api.lexicon.KnowledgeType;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.common.Botania;
import vazkii.botania.common.advancement_triggers.UseLexiconTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
@@ -180,8 +182,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
Botania.proxy.setLexiconStack(stack);
player.openGui(Botania.instance, LibGuiIDs.LEXICON, world, 0, 0, 0);
if(!world.isRemote && !skipSound)
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F);
if(!world.isRemote) {
if(!skipSound)
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F);
UseLexiconTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack);
}
}
@Override
@@ -10,22 +10,36 @@
*/
package vazkii.botania.common.item.block;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementManager;
import net.minecraft.advancements.PlayerAdvancements;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.IRecipeKeyProvider;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.signature.SubTileSignature;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileSpecialFlower;
@@ -36,6 +50,7 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.List;
@Mod.EventBusSubscriber
public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider {
public ItemBlockSpecialFlower(Block block1) {
@@ -112,4 +127,28 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
return "flower." + getType(stack);
}
@SubscribeEvent
public static void onItemPickup(EntityItemPickupEvent evt) {
if(evt.getItem().getItem().getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) {
PlayerAdvancements advancements = ((EntityPlayerMP) evt.getEntityPlayer()).getAdvancements();
AdvancementManager manager = ((WorldServer) evt.getEntity().getEntityWorld()).getAdvancementManager();
String type = getType(evt.getItem().getItem());
Class subtile = BotaniaAPI.getSubTileMapping(type);
Advancement adv = null;
if(SubTileGenerating.class.isAssignableFrom(subtile)) {
adv = manager.getAdvancement(new ResourceLocation(LibMisc.MOD_ID, "main/electric_magic"));
}
if(SubTileFunctional.class.isAssignableFrom(subtile)) {
// todo the other one
}
if(adv != null) {
advancements.grantCriterion(adv, "code_triggered");
}
}
}
}