diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index dfd271cc5..5cc27364b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -135,7 +135,6 @@ public final class ModelHandler { RenderingRegistry.registerEntityRenderingHandler(ModEntities.MANA_BURST, RenderNoop::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.PLAYER_MOVER, RenderNoop::new); - RenderingRegistry.registerEntityRenderingHandler(ModEntities.SIGNAL_FLARE, RenderNoop::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.FLAME_RING, RenderNoop::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.MAGIC_LANDMINE, RenderMagicLandmine::new); RenderingRegistry.registerEntityRenderingHandler(ModEntities.MAGIC_MISSILE, RenderNoop::new); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java deleted file mode 100644 index a13ee6466..000000000 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.entity; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.item.DyeColor; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.IPacket; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.util.SoundEvents; -import net.minecraft.world.World; -import net.minecraftforge.fml.network.NetworkHooks; - -import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.Botania; - -import javax.annotation.Nonnull; - -public class EntitySignalFlare extends Entity { - private static final String COLOR_TAG = "color"; - private static final String FIRED_Y_TAG = "firedY"; - private static final DataParameter COLOR = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); - private static final DataParameter FIRED_Y = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); - - public EntitySignalFlare(EntityType type, World world) { - super(type, world); - } - - public EntitySignalFlare(World world) { - this(ModEntities.SIGNAL_FLARE, world); - } - - @Override - protected void registerData() { - dataManager.register(COLOR, 0); - dataManager.register(FIRED_Y, 0); - } - - @Override - public void baseTick() { - super.baseTick(); - if (ticksExisted++ >= 100) { - remove(); - } - - if (!removed) { - if (ticksExisted % 10 == 0) { - playSound(SoundEvents.ENTITY_CREEPER_PRIMED, 1F, 1F); - } - - int color = getColor(); - if (color < 16 && color >= 0) { - int hex = DyeColor.byId(color).getColorValue(); - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = hex & 0xFF; - - for (int i = 0; i < 3; i++) { - WispParticleData data = WispParticleData.wisp((float) Math.random() * 5 + 1F, r / 255F, g / 255F, b / 255F); - Botania.proxy.addParticleForce(world, data, getPosX(), getPosY(), getPosZ() + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) getPosY())), (float) (Math.random() - 0.5F)); - } - - for (int i = 0; i < 4; i++) { - WispParticleData data = WispParticleData.wisp((float) Math.random() * 15 + 8F, r / 255F, g / 255F, b / 255F); - Botania.proxy.addParticleForce(world, data, getPosX() + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), getPosZ() + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); - } - } - } - } - - @Override - protected void readAdditional(@Nonnull CompoundNBT nbttagcompound) { - setColor(nbttagcompound.getInt(COLOR_TAG)); - setFiredAt(nbttagcompound.getInt(FIRED_Y_TAG)); - } - - @Override - protected void writeAdditional(@Nonnull CompoundNBT nbttagcompound) { - nbttagcompound.putInt(COLOR_TAG, getColor()); - nbttagcompound.putInt(FIRED_Y_TAG, getFiredAt()); - } - - @Nonnull - @Override - public IPacket createSpawnPacket() { - return NetworkHooks.getEntitySpawningPacket(this); - } - - public void setColor(int color) { - dataManager.set(COLOR, color); - } - - public int getColor() { - return dataManager.get(COLOR); - } - - public void setFiredAt(int y) { - dataManager.set(FIRED_Y, y); - } - - public int getFiredAt() { - return dataManager.get(FIRED_Y); - } - -} diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index 3ad3ed0ff..9a4b7caec 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -26,13 +26,6 @@ public final class ModEntities { .setTrackingRange(64) .setShouldReceiveVelocityUpdates(true) .build(""); - public static final EntityType SIGNAL_FLARE = EntityType.Builder.create( - EntitySignalFlare::new, EntityClassification.MISC) - .size(0, 0) - .setUpdateInterval(10) - .setTrackingRange(2048) - .setShouldReceiveVelocityUpdates(false) - .build(""); public static final EntityType PIXIE = EntityType.Builder.create(EntityPixie::new, EntityClassification.MISC) .size(1, 1) .setUpdateInterval(3) @@ -142,7 +135,6 @@ public final class ModEntities { public static void registerEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); register(r, LibEntityNames.MANA_BURST, MANA_BURST); - register(r, LibEntityNames.SIGNAL_FLARE, SIGNAL_FLARE); register(r, LibEntityNames.PIXIE, PIXIE); register(r, LibEntityNames.FLAME_RING, FLAME_RING); register(r, LibEntityNames.VINE_BALL, VINE_BALL); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 5ff242c4b..f0d25aa0e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -37,7 +37,6 @@ import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; -import vazkii.botania.common.entity.EntitySignalFlare; import javax.annotation.Nonnull; @@ -151,22 +150,9 @@ public class ItemBottledMana extends Item { } break; } - case 12: { // Flare + case 12: { // ??? if (!living.world.isRemote) { - EntitySignalFlare flare = new EntitySignalFlare(living.world); - flare.setPosition(living.getPosX(), living.getPosY(), living.getPosZ()); - flare.setColor(living.world.rand.nextInt(16)); - flare.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 40F, (1.0F + (living.world.rand.nextFloat() - living.world.rand.nextFloat()) * 0.2F) * 0.7F); - - living.world.addEntity(flare); - - int range = 5; - List entities = living.world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(living.getPosX() - range, living.getPosY() - range, living.getPosZ() - range, living.getPosX() + range, living.getPosY() + range, living.getPosZ() + range)); - for (LivingEntity entity : entities) { - if (entity != living && (!(entity instanceof PlayerEntity) || ServerLifecycleHooks.getCurrentServer() == null || ServerLifecycleHooks.getCurrentServer().isPVPEnabled())) { - entity.addPotionEffect(new EffectInstance(Effects.SLOWNESS, 50, 5)); - } - } + // todo 1.16 pick something new } break; diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index c8df5393c..efd18c75b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -12,7 +12,6 @@ import net.minecraft.util.ResourceLocation; public final class LibEntityNames { public static final ResourceLocation MANA_BURST = makeName("mana_burst"); - public static final ResourceLocation SIGNAL_FLARE = makeName("signal_flare"); public static final ResourceLocation PIXIE = makeName("pixie"); public static final ResourceLocation FLAME_RING = makeName("flame_ring"); public static final ResourceLocation VINE_BALL = makeName("vine_ball"); diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index 3f519853a..dbcf34c27 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -51,10 +51,9 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .collect(Collectors.toSet()); registerItemBlocks(takeAll(items, i -> i instanceof BlockItem).stream().map(i -> (BlockItem) i).collect(Collectors.toSet())); registerItemOverrides(items); - takeAll(items, i -> i instanceof ItemLens).forEach(i -> - getBuilder(name(i)).parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/lens")) - .texture("layer1", prefix("item/" + name(i)))); + takeAll(items, i -> i instanceof ItemLens).forEach(i -> getBuilder(name(i)).parent(getExistingFile(GENERATED)) + .texture("layer0", prefix("item/lens")) + .texture("layer1", prefix("item/" + name(i)))); } private static String name(Item i) { @@ -65,21 +64,22 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator private ItemModelBuilder generatedItem(String name) { return getBuilder(name).parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/" + name)); + .texture("layer0", prefix("item/" + name)); } + private ItemModelBuilder generatedItem(Item i) { return generatedItem(name(i)); } private void registerItemOverrides(Set items) { generatedItem(blackHoleTalisman).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(blackHoleTalisman) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(blackHoleTalisman) + "_active")).end(); items.remove(blackHoleTalisman); generatedItem(elementiumShears).override() - .predicate(prefix("reddit"), 1) - .model(generatedItem("dammitreddit")).end(); + .predicate(prefix("reddit"), 1) + .model(generatedItem("dammitreddit")).end(); items.remove(elementiumShears); ModelFile vuvuzela = generatedItem("vuvuzela"); @@ -91,106 +91,106 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator items.remove(snowHorn); generatedItem(infiniteFruit).override() - .predicate(prefix("boot"), 1) - .model(generatedItem("dasboot")).end(); + .predicate(prefix("boot"), 1) + .model(generatedItem("dasboot")).end(); items.remove(infiniteFruit); generatedItem(lexicon).override() - .predicate(prefix("elven"), 1) - .model(generatedItem(name(lexicon) + "_elven")).end(); + .predicate(prefix("elven"), 1) + .model(generatedItem(name(lexicon) + "_elven")).end(); items.remove(lexicon); generatedItem(magnetRing).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(magnetRing) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(magnetRing) + "_active")).end(); items.remove(magnetRing); generatedItem(magnetRingGreater).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(magnetRingGreater) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(magnetRingGreater) + "_active")).end(); items.remove(magnetRingGreater); generatedItem(manaCookie).override() - .predicate(prefix("totalbiscuit"), 1) - .model(generatedItem("totalbiscuit")).end(); + .predicate(prefix("totalbiscuit"), 1) + .model(generatedItem("totalbiscuit")).end(); items.remove(manaCookie); generatedItem(manasteelSword).override() - .predicate(prefix("elucidator"), 1) - .model(generatedItem("elucidator")).end(); + .predicate(prefix("elucidator"), 1) + .model(generatedItem("elucidator")).end(); items.remove(manasteelSword); generatedItem(manaweaveHelm).override() - .predicate(prefix("holiday"), 1) - .model(generatedItem(name(manaweaveHelm) + "_holiday")).end(); + .predicate(prefix("holiday"), 1) + .model(generatedItem(name(manaweaveHelm) + "_holiday")).end(); items.remove(manaweaveHelm); generatedItem(manaweaveChest).override() - .predicate(prefix("holiday"), 1) - .model(generatedItem(name(manaweaveChest) + "_holiday")).end(); + .predicate(prefix("holiday"), 1) + .model(generatedItem(name(manaweaveChest) + "_holiday")).end(); items.remove(manaweaveChest); generatedItem(manaweaveLegs).override() - .predicate(prefix("holiday"), 1) - .model(generatedItem(name(manaweaveLegs) + "_holiday")).end(); + .predicate(prefix("holiday"), 1) + .model(generatedItem(name(manaweaveLegs) + "_holiday")).end(); items.remove(manaweaveLegs); generatedItem(manaweaveBoots).override() - .predicate(prefix("holiday"), 1) - .model(generatedItem(name(manaweaveBoots) + "_holiday")).end(); + .predicate(prefix("holiday"), 1) + .model(generatedItem(name(manaweaveBoots) + "_holiday")).end(); items.remove(manaweaveBoots); generatedItem(slimeBottle).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(slimeBottle) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(slimeBottle) + "_active")).end(); items.remove(slimeBottle); generatedItem(spawnerMover).override() - .predicate(prefix("full"), 1) - .model(generatedItem(name(spawnerMover) + "_full")).end(); + .predicate(prefix("full"), 1) + .model(generatedItem(name(spawnerMover) + "_full")).end(); items.remove(spawnerMover); generatedItem(temperanceStone).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(temperanceStone) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(temperanceStone) + "_active")).end(); items.remove(temperanceStone); generatedItem(terraAxe).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(terraAxe) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(terraAxe) + "_active")).end(); items.remove(terraAxe); ModelFile enabledModel = getBuilder(name(terraPick) + "_active") - .parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/" + name(terraPick))) - .texture("layer1", prefix("item/" + name(terraPick) + "_active")); + .parent(getExistingFile(GENERATED)) + .texture("layer0", prefix("item/" + name(terraPick))) + .texture("layer1", prefix("item/" + name(terraPick) + "_active")); ModelFile tippedEnabledModel = getBuilder(name(terraPick) + "_tipped_active") - .parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/" + name(terraPick) + "_tipped")) - .texture("layer1", prefix("item/" + name(terraPick) + "_active")); + .parent(getExistingFile(GENERATED)) + .texture("layer0", prefix("item/" + name(terraPick) + "_tipped")) + .texture("layer1", prefix("item/" + name(terraPick) + "_active")); generatedItem(terraPick).override() - .predicate(prefix("active"), 1) - .model(enabledModel).end() - .override() - .predicate(prefix("tipped"), 1) - .model(generatedItem(name(terraPick) + "_tipped")).end() - .override() - .predicate(prefix("tipped"), 1).predicate(prefix("active"), 1) - .model(tippedEnabledModel).end(); + .predicate(prefix("active"), 1) + .model(enabledModel).end() + .override() + .predicate(prefix("tipped"), 1) + .model(generatedItem(name(terraPick) + "_tipped")).end() + .override() + .predicate(prefix("tipped"), 1).predicate(prefix("active"), 1) + .model(tippedEnabledModel).end(); items.remove(terraPick); generatedItem(tornadoRod).override() - .predicate(prefix("active"), 1) - .model(generatedItem(name(tornadoRod) + "_active")).end(); + .predicate(prefix("active"), 1) + .model(generatedItem(name(tornadoRod) + "_active")).end(); items.remove(tornadoRod); generatedItem(twigWand) - .texture("layer1", prefix("item/" + name(twigWand) + "_top")) - .texture("layer2", prefix("item/" + name(twigWand) + "_bottom")) - .override() - .predicate(prefix("bindmode"), 1) - .model(generatedItem(name(twigWand) + "_bind")).end(); + .texture("layer1", prefix("item/" + name(twigWand) + "_top")) + .texture("layer2", prefix("item/" + name(twigWand) + "_bottom")) + .override() + .predicate(prefix("bindmode"), 1) + .model(generatedItem(name(twigWand) + "_bind")).end(); items.remove(twigWand); } diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 7e78c56b1..683ece16c 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -298,7 +298,6 @@ "death.attack.botania-relic": "%s was punished for using a relic that isn't theirs", - "entity.botania.signal_flare": "Signal Flare", "entity.botania.mana_burst": "Mana Burst", "entity.botania.pixie": "Pixie", "entity.botania.flame_ring": "Flame Ring", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 30fe640b6..94b80435d 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -258,7 +258,6 @@ "death.attack.botania-relic": "%s ha sido castigado por usar una reliquia que no es suya", "entity.botania.mana_burst": "Pulso de maná", - "entity.botania.signal_flare": "Bengala de señales", "entity.botania.pixie": "Hada", "entity.botania.flame_ring": "Anillo de llama", "entity.botania.vine_ball": "Bola de enredadera", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index c1486fbd0..7d256155b 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -252,7 +252,6 @@ "death.attack.botania-relic": "%s a été puni en utilisant une relique qui n'était pas la sienne", "entity.botania.mana_burst": "Explosion de mana", - "entity.botania.signal_flare": "Feux de détresse", "entity.botania.pixie": "Lutin", "entity.botania.flame_ring": "Anneau de flamme", "entity.botania.vine_ball": "Boule de vigne", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index e478ad50e..ee3c3b3b8 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -262,7 +262,6 @@ "death.attack.botania-relic": "%s은(는) 타인 소유의 유물에 욕심을 내 천벌이 내려졌습니다.", "entity.botania.mana_burst": "마나 버스터", - "entity.botania.signal_flare": "신호탄", "entity.botania.pixie": "픽시", "entity.botania.flame_ring": "화염의 고리", "entity.botania.vine_ball": "덩굴 공", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 5b2b276ed..913672487 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -227,7 +227,6 @@ "death.attack.botania-relic": "%s werd gestraft voor gebruik van een reliek van een ander", "entity.botania.mana_burst": "Mana Burst", - "entity.botania.signal_flare": "Signaalpistool", "entity.botania.pixie": "Elfje", "entity.botania.flame_ring": "Vuur Ring", "entity.botania.vine_ball": "Lianenbol", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 5fb7d7fad..0f5bf8755 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -337,7 +337,6 @@ "death.attack.botania-relic": "%s foi punido por usar uma relíquia que não lhe pertencia", "entity.botania.mana_burst": "Pulso de Mana", - "entity.botania.signal_flare": "Fagulhas Sinalizadoras", "entity.botania.pixie": "Fada", "entity.botania.flame_ring": "Anel de Chamas", "entity.botania.vine_ball": "Bola de Vinhas", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 3500adf6d..4cc60d0d9 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -312,7 +312,6 @@ "death.attack.botania-relic": "%s 因使用不属于他的遗物而被惩罚致死", "entity.botania.mana_burst": "魔力脉冲", - "entity.botania.signal_flare": "信号弹", "entity.botania.pixie": "小精灵", "entity.botania.flame_ring": "火焰圈", "entity.botania.vine_ball": "藤蔓球", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index a17c8a9e8..69b04bfc2 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -305,7 +305,6 @@ "death.attack.botania-relic": "%s 因使用不屬於他的遺物而受天譴致死", "entity.botania.mana_burst": "瑪那脈衝", - "entity.botania.signal_flare": "信號彈", "entity.botania.pixie": "小精靈", "entity.botania.flame_ring": "火焰圈", "entity.botania.vine_ball": "籐蔓球", diff --git a/src/main/resources/assets/botania/models/item/signal_flare.json b/src/main/resources/assets/botania/models/item/signal_flare.json deleted file mode 100644 index 6ec2aae5f..000000000 --- a/src/main/resources/assets/botania/models/item/signal_flare.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:item/signalflare0", - "layer1": "botania:item/signalflare1" - } -} diff --git a/src/main/resources/assets/botania/textures/item/signal_flare.png b/src/main/resources/assets/botania/textures/item/signal_flare.png deleted file mode 100644 index 9c04e33b7..000000000 Binary files a/src/main/resources/assets/botania/textures/item/signal_flare.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/item/signal_flare_overlay.png b/src/main/resources/assets/botania/textures/item/signal_flare_overlay.png deleted file mode 100644 index 17661d60b..000000000 Binary files a/src/main/resources/assets/botania/textures/item/signal_flare_overlay.png and /dev/null differ diff --git a/src/main/resources/data/botania/tags/entity_types/shaded_mesa_blacklist.json b/src/main/resources/data/botania/tags/entity_types/shaded_mesa_blacklist.json index 231ee931f..631530c82 100644 --- a/src/main/resources/data/botania/tags/entity_types/shaded_mesa_blacklist.json +++ b/src/main/resources/data/botania/tags/entity_types/shaded_mesa_blacklist.json @@ -13,8 +13,7 @@ "botania:magic_missile", "botania:mana_burst", "botania:pink_wither", - "botania:signal_flare", "botania:spark", "botania:player_mover" ] -} \ No newline at end of file +}