Fix code granting of criterion for last commit

This commit is contained in:
Vincent Lee committed 2017-07-01 22:16:56 -05:00
1 parent 288bbf5dc1
commit 27d66c18ba
9 files changed
+11 -117

No files matched your search

@@ -43,7 +43,6 @@ 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;
@@ -147,11 +146,6 @@ 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());
@@ -1,101 +0,0 @@
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);
}
}
}
}
@@ -70,7 +70,7 @@ public class TileTinyPotato extends TileSimpleInventory {
}
}
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/just_be_friends"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/tiny_potato_pet"), "code_triggered");
}
}
@@ -28,6 +28,7 @@ import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -46,7 +47,6 @@ 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;
@@ -185,7 +185,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
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);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/lexicon_use"), "code_triggered");
}
}
@@ -90,7 +90,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
if(!world.isRemote) {
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1);
world.spawnEntity(burst);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/maider_stranded_girl"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/mana_blaster_shoot"), "code_triggered");
} else {
player.swingArm(hand);
player.motionX -= burst.motionX * 0.1;
@@ -121,7 +121,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
if(!world.isRemote) {
world.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2);
world.playSound(null, pos, ModSounds.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/odds_and_ends"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/enchanter_make"), "code_triggered");
} else {
for(int i = 0; i < 50; i++) {
float red = (float) Math.random();
@@ -135,11 +135,11 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
Class subtile = BotaniaAPI.getSubTileMapping(type);
if(SubTileGenerating.class.isAssignableFrom(subtile)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/electric_magic"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/generating_flower"), "code_triggered");
}
if(SubTileFunctional.class.isAssignableFrom(subtile)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/ecstatic_vivace"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered");
}
}
}
@@ -81,7 +81,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
baubles.setStackInSlot(i, toEquip);
stack.shrink(1);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/inner_arts"), "code_triggered");
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/bauble_wear"), "code_triggered");
if(!stackInSlot.isEmpty()) {
((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player);