Skip to content

Excaliber And Flugel eye. #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thenextelement wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Excaliber And Flugel eye. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b8dc22
Revert Eye of the FLugel to functionality present in versions prior t…
thenextelement Nov 27, 2025
8beb9d2
Update Link to Witchery Wiki
thenextelement Nov 27, 2025
0734b38
Add Excaliber back, still needs lots of ironing out to get it to spaw…
thenextelement Nov 27, 2025
4c2dba9
Update Link to Witchery Wiki- tested and works
thenextelement Nov 27, 2025
d8a4421
Localized Excaliber, Added to and Arranged Achievements and added Exc…
thenextelement Nov 27, 2025
ccc82f0
Fix Eye of the flugel HUD :D
thenextelement Nov 28, 2025
66cff05
Forgot to re localize Loki ring D:
thenextelement Nov 28, 2025
db8891d
Extend Dice pool to 7 rolls for Excaliber.
thenextelement Nov 28, 2025
cd37f1d
Merge remote-tracking branch 'origin/master' into test
thenextelement Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .github/workflows/build-and-test.yml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/release-tags.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/vazkii/botania/api/BotaniaAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public final class BotaniaAPI {
registerModWiki("EnderIO", new SimpleWikiProvider("EnderIO Wiki", "http://wiki.enderio.com/%s"));
registerModWiki("TropiCraft", new SimpleWikiProvider("Tropicraft Wiki", "http://wiki.tropicraft.net/wiki/%s"));
registerModWiki("RandomThings", new SimpleWikiProvider("Random Things Wiki", "http://randomthingsminecraftmod.wikispaces.com/%s"));
registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://sites.google.com/site/witcherymod/%s", "-", true));
registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://legacy-wiki.msrandom.net/site/witcherymod/%s", "-", true));
registerModWiki("AppliedEnergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s"));
registerModWiki("BigReactors", technicWiki);
registerModWiki("BuildCraft|Core", buildcraftWiki);
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/vazkii/botania/client/core/handler/HUDHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.item.relic.ItemFlugelEye;
import vazkii.botania.common.lib.LibObfuscation;
import baubles.common.lib.PlayerHandler;
import cpw.mods.fml.common.eventhandler.EventPriority;
Expand Down Expand Up @@ -153,11 +154,11 @@ else if(tile != null && tile instanceof TileRuneAltar)
profiler.endSection();
}

/*if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) {
profiler.startSection("flugelEye");
ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack);
profiler.endSection();
}*/
if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) {
profiler.startSection("flugelEye");
ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack);
profiler.endSection();
}

if(Botania.proxy.isClientPlayerWearingMonocle()) {
profiler.startSection("monocle");
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/vazkii/botania/common/achievement/ModAchievements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public final class ModAchievements {
public static Achievement pinkinator;

public static Achievement relicInfiniteFruit;
public static Achievement relicExcaliber;
public static Achievement relicKingKey;
public static Achievement relicFlugelEye;
public static Achievement relicThorRing;
Expand Down Expand Up @@ -139,12 +140,13 @@ public static void init() {

if(ConfigHandler.relicsEnabled) {
relicInfiniteFruit = new AchievementMod(LibAchievementNames.RELIC_INFINITE_FRUIT, -9, 8, ModItems.infiniteFruit, null);
relicExcaliber = new AchievementMod(LibAchievementNames.RELIC_EXCALIBER, -7, 8, ModItems.excaliber, null).setSpecial();
relicKingKey = new AchievementMod(LibAchievementNames.RELIC_KING_KEY, -7, 11, ModItems.kingKey, null);
relicFlugelEye = new AchievementMod(LibAchievementNames.RELIC_FLUGEL_EYE, -5, 8, ModItems.flugelEye, null);
relicThorRing = new AchievementMod(LibAchievementNames.RELIC_THOR_RING, -7, 7, ModItems.thorRing, null);
relicOdinRing = new AchievementMod(LibAchievementNames.RELIC_ODIN_RING, -9, 10, ModItems.odinRing, null);
relicLokiRing = new AchievementMod(LibAchievementNames.RELIC_LOKI_RING, -5, 10, ModItems.lokiRing, null);
relicAesirRing = new AchievementMod(LibAchievementNames.RELIC_AESIR_RING, -7, 9, ModItems.aesirRing, null).setSpecial();
relicAesirRing = new AchievementMod(LibAchievementNames.RELIC_AESIR_RING, -7, 10, ModItems.aesirRing, null).setSpecial();
}

nullFlower = new AchievementMod(LibAchievementNames.NULL_FLOWER, -8, 0, ModBlocks.specialFlower, null).setSpecial();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ public void displayAllReleventItems(List<ItemStack> list) {
addItem(ModItems.odinRing);
addItem(ModItems.lokiRing);
addItem(ModItems.aesirRing);
addItem(ModItems.excaliber);
}

addItem(ModItems.baubleBox);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/vazkii/botania/common/item/ModItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
import vazkii.botania.common.item.record.ItemRecordGaia2;
import vazkii.botania.common.item.relic.ItemAesirRing;
import vazkii.botania.common.item.relic.ItemDice;
import vazkii.botania.common.item.relic.ItemExcaliber;
import vazkii.botania.common.item.relic.ItemFlugelEye;
import vazkii.botania.common.item.relic.ItemInfiniteFruit;
import vazkii.botania.common.item.relic.ItemKingKey;
Expand Down Expand Up @@ -239,6 +240,7 @@ public final class ModItems {
public static Item poolMinecart;
public static Item pinkinator;
public static Item infiniteFruit;
public static Item excaliber;
public static Item kingKey;
public static Item flugelEye;
public static Item thorRing;
Expand Down Expand Up @@ -389,6 +391,7 @@ public static void init() {
poolMinecart = new ItemPoolMinecart();
pinkinator = new ItemPinkinator();
infiniteFruit = new ItemInfiniteFruit();
excaliber = new ItemExcaliber();
kingKey = new ItemKingKey();
flugelEye = new ItemFlugelEye();
thorRing = new ItemThorRing();
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/vazkii/botania/common/item/relic/ItemDice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public ItemDice() {

relicStacks = new ItemStack[] {
new ItemStack(ModItems.infiniteFruit),
new ItemStack(ModItems.excaliber),
new ItemStack(ModItems.kingKey),
new ItemStack(ModItems.flugelEye),
new ItemStack(ModItems.thorRing),
Expand All @@ -56,7 +57,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla
if(hasRelicAlready(player, relic)) {
List<Integer> possible = new ArrayList<>();
List<Integer> alreadyHas = new ArrayList<>();
for(int i = 0; i < 6; i++)
for(int i = 0; i < 7; i++)
if(hasRelicAlready(player, i))
alreadyHas.add(i);
else possible.add(i);
Expand Down Expand Up @@ -87,7 +88,7 @@ public boolean shouldDamageWrongPlayer() {
}

boolean hasRelicAlready(EntityPlayer player, int relic) {
if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP mpPlayer))
if(relic < 0 || relic > 7 || !(player instanceof EntityPlayerMP mpPlayer))
return true;

Item item = relicStacks[relic].getItem();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* File Created @ [Mar 29, 2015, 10:12:50 PM (GMT)]
*/
/*package vazkii.botania.common.item.relic;
package vazkii.botania.common.item.relic;

import java.util.List;

Expand Down Expand Up @@ -220,4 +220,3 @@ public EnumRarity getRarity(ItemStack p_77613_1_) {
}

}
*/
Loading