mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-22 05:02:30 +00:00
Bunch more advancements (that don't seem to work for some reason >.>)
This commit is contained in:
1 parent
6671486c11
commit
69b2e1483c
15 files changed
+463
-16
No files matched your search
@@ -15,9 +15,11 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
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.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
@@ -27,8 +29,10 @@ import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.common.block.tile.TileAlfPortal;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -84,6 +88,9 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable
|
||||
@Override
|
||||
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) {
|
||||
boolean did = ((TileAlfPortal) world.getTileEntity(pos)).onWanded();
|
||||
if(!world.isRemote && did) {
|
||||
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/elf_portal_open"), "code_triggered");
|
||||
}
|
||||
return did;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import net.minecraft.network.datasync.EntityDataManager;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
@@ -34,7 +35,9 @@ import vazkii.botania.api.wand.IWandBindable;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.Color;
|
||||
@@ -49,8 +52,8 @@ public class TileLightRelay extends TileMod implements IWandBindable {
|
||||
private static final String TAG_BIND_Y = "bindY";
|
||||
private static final String TAG_BIND_Z = "bindZ";
|
||||
|
||||
BlockPos bindPos = new BlockPos(0, -1, 0);
|
||||
int ticksElapsed = 0;
|
||||
private BlockPos bindPos = new BlockPos(0, -1, 0);
|
||||
private int ticksElapsed = 0;
|
||||
|
||||
public void mountEntity(Entity e) {
|
||||
BlockPos nextDest = getNextDestination();
|
||||
@@ -63,6 +66,9 @@ public class TileLightRelay extends TileMod implements IWandBindable {
|
||||
if(!(e instanceof EntityItem)) {
|
||||
mover.playSound(ModSounds.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F);
|
||||
}
|
||||
if(e instanceof EntityPlayerMP) {
|
||||
PlayerHelper.grantCriterion((EntityPlayerMP) e, new ResourceLocation(LibMisc.MOD_ID, "main/luminizer_ride"), "code_triggered");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -31,7 +32,9 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
@@ -99,20 +102,24 @@ public class ItemSpawnerMover extends ItemMod {
|
||||
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xOffset, float yOffset, float zOffset) {
|
||||
ItemStack itemstack = player.getHeldItem(hand);
|
||||
if(getEntityId(itemstack) == null) {
|
||||
if(world.getBlockState(pos).getBlock().equals(Blocks.MOB_SPAWNER)) {
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
tag.setTag(TAG_SPAWNER, new NBTTagCompound());
|
||||
te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER));
|
||||
tag.setInteger(TAG_PLACE_DELAY, 20);
|
||||
itemstack.setTagCompound(tag);
|
||||
world.setBlockToAir(pos);
|
||||
player.renderBrokenItemStack(itemstack);
|
||||
for(int i = 0; i < 50; i++) {
|
||||
float red = (float) Math.random();
|
||||
float green = (float) Math.random();
|
||||
float blue = (float) Math.random();
|
||||
Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F);
|
||||
if(world.getBlockState(pos).getBlock() == Blocks.MOB_SPAWNER) {
|
||||
if(!world.isRemote) {
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
tag.setTag(TAG_SPAWNER, new NBTTagCompound());
|
||||
te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER));
|
||||
tag.setInteger(TAG_PLACE_DELAY, 20);
|
||||
itemstack.setTagCompound(tag);
|
||||
world.setBlockToAir(pos);
|
||||
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/spawner_mover_use"), "code_triggered");
|
||||
} else {
|
||||
player.renderBrokenItemStack(itemstack);
|
||||
for(int i = 0; i < 50; i++) {
|
||||
float red = (float) Math.random();
|
||||
float green = (float) Math.random();
|
||||
float blue = (float) Math.random();
|
||||
Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F);
|
||||
}
|
||||
}
|
||||
return EnumActionResult.SUCCESS;
|
||||
} else return EnumActionResult.PASS;
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"bubbell\"}"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:bubbellPickup"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:bubbellPickup.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/elf_portal_open",
|
||||
"criteria": {
|
||||
"bubbell": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"bubbell\"}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:corporeacrystalcube"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:corporeaCraft"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:corporeaCraft.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/ender_air_make",
|
||||
"criteria": {
|
||||
"crystalcube": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:corporeacrystalcube"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"funnel": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:corporeafunnel"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"index": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:corporeaindex"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"interceptor": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:corporeainterceptor"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"retainer": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:corporearetainer"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[ "crystalcube", "funnel", "index", "interceptor", "retainer" ]
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"dandelifeon\"}"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:dandelifeonPickup"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:dandelifeonPickup.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/gaia_guardian_kill",
|
||||
"criteria": {
|
||||
"dandelifeon": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"dandelifeon\"}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:alfheimportal"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:elfPortalOpen"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:elfPortalOpen.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/terrasteel_pickup",
|
||||
"__comment": "This is triggered by code in Botania. In the future, it may become data-driven",
|
||||
"criteria": {
|
||||
"code_triggered": {
|
||||
"trigger": "minecraft:impossible"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:manaresource",
|
||||
"data": 15
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:enderAirMake"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:enderAirMake.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/elf_portal_open",
|
||||
"criteria": {
|
||||
"air": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:manaresource",
|
||||
"data": 15
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:gaiahead"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:gaiaGuardianKill"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:gaiaGuardianKill.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/elf_portal_open",
|
||||
"criteria": {
|
||||
"guardian": {
|
||||
"trigger": "minecraft:player_killed_entity",
|
||||
"conditions": {
|
||||
"entity": {
|
||||
"type": "botania:doppleganger"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"heiseiDream\"}"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:heiseiDreamPickup"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:heiseiDreamPickup.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/elf_portal_open",
|
||||
"criteria": {
|
||||
"heisei_dream": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"heiseiDream\"}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"kekimurus\"}"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:kekimurusPickup"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:kekimurusPickup.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/elf_portal_open",
|
||||
"criteria": {
|
||||
"kekimurus": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:specialFlower",
|
||||
"nbt": "{\"type\": \"kekimurus\"}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:lightrelay"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:luminizerRide"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:luminizerRide.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/ender_air_make",
|
||||
"__comment": "This is triggered by code in Botania. In the future, it may become data-driven",
|
||||
"criteria": {
|
||||
"code_triggered": {
|
||||
"trigger": "minecraft:impossible"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:manabomb"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:manaBombIgnite"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:manaBombIgnite.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/gaia_guardian_kill",
|
||||
"criteria": {
|
||||
"bomb": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:manabomb"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:spawnermover"
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:spawnerMoverUse"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:spawnerMoverUse.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/gaia_guardian_kill",
|
||||
"__comment": "This is triggered by code in Botania. In the future, it may become data-driven",
|
||||
"criteria": {
|
||||
"code_triggered": {
|
||||
"trigger": "minecraft:impossible"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
"display": {
|
||||
"icon": {
|
||||
"item": "botania:flighttiara",
|
||||
"data": 1
|
||||
},
|
||||
"title": {
|
||||
"translate": "advancement.botania:tiaraWings"
|
||||
},
|
||||
"description": {
|
||||
"translate": "advancement.botania:tiaraWings.desc"
|
||||
}
|
||||
},
|
||||
"parent": "botania:main/gaia_guardian_kill",
|
||||
"criteria": {
|
||||
"meta1": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta2": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta3": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta4": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta5": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 5
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta6": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 6
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta7": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 7
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"meta8": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"item": "botania:flighttiara",
|
||||
"data": 8
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[ "meta1", "meta2", "meta3", "meta4", "meta5", "meta6", "meta7", "meta8" ]
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user