Skip to content

Commit

Permalink
added some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ItzKatze
ItzKatze committed Jun 22, 2024
1 parent 44f1924 commit 4945a88
Show file tree
Hide file tree
Showing 11 changed files with 223 additions and 14 deletions.
2 changes: 2 additions & 0 deletions commons/src/main/java/net/swofty/commons/item/ItemType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public enum ItemType {
ZOMBIE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON),
ZOMBIE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE),
SPEED_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
SPEED_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON),
SPEED_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE),
SKELETON_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
HASTE_RING(Material.PLAYER_HEAD, Rarity.RARE),
FARMING_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
Expand Down
53 changes: 50 additions & 3 deletions ...eric/src/main/java/net/swofty/types/generic/collection/collections/FarmingCollection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,22 @@ public int xp() {
public int xp() {
return 4;
}
}),
},
new UnlockRecipe() {
@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemType.SUGAR_CANE, 12));
List<String> pattern = List.of(
"AAA",
"AAA",
"AAA"
);

return new ShapedRecipe(SkyBlockRecipe.RecipeType.FARMING, new SkyBlockItem(ItemType.SPEED_TALISMAN), ingredientMap, pattern);
}
}
),
new ItemCollectionReward(500, new UnlockXP() {
@Override
public int xp() {
Expand Down Expand Up @@ -1568,7 +1583,23 @@ public SkyBlockRecipe<?> getRecipe() {
public int xp() {
return 4;
}
}),
},
new UnlockRecipe() {
@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemType.ENCHANTED_SUGAR, 12));
ingredientMap.put('B', new MaterialQuantifiable(ItemType.SPEED_TALISMAN, 1));
List<String> pattern = List.of(
"AAA",
"ABA",
"AAA"
);

return new ShapedRecipe(SkyBlockRecipe.RecipeType.FARMING, new SkyBlockItem(ItemType.SPEED_RING), ingredientMap, pattern);
}
}
),
new ItemCollectionReward(5000, new UnlockRecipe() {
@Override
public SkyBlockRecipe<?> getRecipe() {
Expand Down Expand Up @@ -1606,7 +1637,23 @@ public SkyBlockRecipe<?> getRecipe() {
public int xp() {
return 4;
}
}),
},
new UnlockRecipe() {
@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemType.ENCHANTED_SUGAR_CANE, 6));
ingredientMap.put('B', new MaterialQuantifiable(ItemType.SPEED_RING, 1));
List<String> pattern = List.of(
"AAA",
"ABA",
"AAA"
);

return new ShapedRecipe(SkyBlockRecipe.RecipeType.FARMING, new SkyBlockItem(ItemType.SPEED_ARTIFACT), ingredientMap, pattern);
}
}
),
new ItemCollectionReward(50000, new UnlockXP() {
@Override
public int xp() {
Expand Down
4 changes: 3 additions & 1 deletion type.generic/src/main/java/net/swofty/types/generic/item/ItemTypeLinker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
import net.swofty.types.generic.item.items.miscellaneous.gifts.GameAnnihilator;
import net.swofty.types.generic.item.items.miscellaneous.gifts.GameBreaker;
import net.swofty.types.generic.item.items.miscellaneous.gifts.QualityMap;
import net.swofty.types.generic.item.items.pet.BeePet;
import net.swofty.types.generic.item.items.pet.pets.BeePet;
import net.swofty.types.generic.item.items.pet.petitems.*;
import net.swofty.types.generic.item.items.runes.BloodRune;
import net.swofty.types.generic.item.items.spooky.*;
Expand Down Expand Up @@ -206,6 +206,8 @@ public enum ItemTypeLinker {
ZOMBIE_RING(ItemType.ZOMBIE_RING, ZombieRing.class),
ZOMBIE_ARTIFACT(ItemType.ZOMBIE_ARTIFACT, ZombieArtifact.class),
SPEED_TALISMAN(ItemType.SPEED_TALISMAN, SpeedTalisman.class),
SPEED_RING(ItemType.SPEED_RING, SpeedRing.class),
SPEED_ARTIFACT(ItemType.SPEED_ARTIFACT, SpeedArtifact.class),
SKELETON_TALISMAN(ItemType.SKELETON_TALISMAN, SkeletonTalisman.class),
HASTE_RING(ItemType.HASTE_RING, HasteRing.class),
FARMING_TALISMAN(ItemType.FARMING_TALISMAN, FarmingTalisman.class),
Expand Down
30 changes: 30 additions & 0 deletions ....generic/src/main/java/net/swofty/types/generic/item/items/accessories/SpeedArtifact.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package net.swofty.types.generic.item.items.accessories;

import net.swofty.commons.statistics.ItemStatistic;
import net.swofty.commons.statistics.ItemStatistics;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.ConstantStatistics;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.List;

public class SpeedArtifact implements Talisman, ConstantStatistics {
@Override
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "f06706eecb2d558ace27abda0b0b7b801d36d17dd7a890a9520dbe522374f8a6";
}

@Override
public List<String> getTalismanDisplay() {
return List.of("§7");
}

@Override
public ItemStatistics getStatistics(SkyBlockItem instance) {
return ItemStatistics.builder()
.withBase(ItemStatistic.SPEED, 5D)
.build();
}
}
30 changes: 30 additions & 0 deletions type.generic/src/main/java/net/swofty/types/generic/item/items/accessories/SpeedRing.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package net.swofty.types.generic.item.items.accessories;

import net.swofty.commons.statistics.ItemStatistic;
import net.swofty.commons.statistics.ItemStatistics;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.ConstantStatistics;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.List;

public class SpeedRing implements Talisman, ConstantStatistics {
@Override
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "c2da40a91f8fa7e1cbdd934da92a7668dc95d75b57c9c80a381c5e178cee6ba7";
}

@Override
public List<String> getTalismanDisplay() {
return List.of("§7");
}

@Override
public ItemStatistics getStatistics(SkyBlockItem instance) {
return ItemStatistics.builder()
.withBase(ItemStatistic.SPEED, 3D)
.build();
}
}
20 changes: 19 additions & 1 deletion ...src/main/java/net/swofty/types/generic/item/items/accessories/dungeon/ScarfsGrimoire.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
package net.swofty.types.generic.item.items.accessories.dungeon;

import net.swofty.types.generic.item.ItemTypeLinker;
import net.swofty.types.generic.item.MaterialQuantifiable;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.DefaultCraftable;
import net.swofty.types.generic.item.impl.NotFinishedYet;
import net.swofty.types.generic.item.impl.SkyBlockRecipe;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.item.impl.recipes.ShapedRecipe;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class ScarfsGrimoire implements Talisman, NotFinishedYet {
public class ScarfsGrimoire implements Talisman, NotFinishedYet, DefaultCraftable {
@Override
public List<String> getTalismanDisplay() {
return List.of("§7Gain dungeon class experience",
Expand All @@ -19,4 +26,15 @@ public List<String> getTalismanDisplay() {
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "bafb195cc75f31b619a077b7853653254ac18f220dc32d1412982ff437b4d57a";
}

@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemTypeLinker.SCARFS_THESIS, 1));
List<String> pattern = List.of(
"AA",
"AA"
);
return new ShapedRecipe(SkyBlockRecipe.RecipeType.NONE, new SkyBlockItem(ItemTypeLinker.SCARFS_GRIMOIRE), ingredientMap, pattern);
}
}
20 changes: 19 additions & 1 deletion ...c/src/main/java/net/swofty/types/generic/item/items/accessories/dungeon/ScarfsThesis.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
package net.swofty.types.generic.item.items.accessories.dungeon;

import net.swofty.types.generic.item.ItemTypeLinker;
import net.swofty.types.generic.item.MaterialQuantifiable;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.DefaultCraftable;
import net.swofty.types.generic.item.impl.NotFinishedYet;
import net.swofty.types.generic.item.impl.SkyBlockRecipe;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.item.impl.recipes.ShapedRecipe;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class ScarfsThesis implements Talisman, NotFinishedYet {
public class ScarfsThesis implements Talisman, NotFinishedYet, DefaultCraftable {
@Override
public List<String> getTalismanDisplay() {
return List.of("§7Gain dungeon class experience",
Expand All @@ -19,4 +26,15 @@ public List<String> getTalismanDisplay() {
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "8ce4c87eb4dde27459e3e7f85921e7e57b11199260caa5ce63f139ee3d188c";
}

@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemTypeLinker.SCARFS_STUDIES, 1));
List<String> pattern = List.of(
"AA",
"AA"
);
return new ShapedRecipe(SkyBlockRecipe.RecipeType.NONE, new SkyBlockItem(ItemTypeLinker.SCARFS_THESIS), ingredientMap, pattern);
}
}
21 changes: 20 additions & 1 deletion ...c/main/java/net/swofty/types/generic/item/items/accessories/dungeon/TreasureArtifact.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
package net.swofty.types.generic.item.items.accessories.dungeon;

import net.swofty.types.generic.item.ItemTypeLinker;
import net.swofty.types.generic.item.MaterialQuantifiable;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.DefaultCraftable;
import net.swofty.types.generic.item.impl.NotFinishedYet;
import net.swofty.types.generic.item.impl.SkyBlockRecipe;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.item.impl.recipes.ShapedRecipe;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class TreasureArtifact implements Talisman, NotFinishedYet {
public class TreasureArtifact implements Talisman, NotFinishedYet, DefaultCraftable {
@Override
public List<String> getTalismanDisplay() {
return List.of("§7Grants §a+3% §7extra loot to end",
Expand All @@ -19,4 +26,16 @@ public List<String> getTalismanDisplay() {
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "e10f20a55b6e188ebe7578459b64a6fbd825067bc497b925ca43c2643d059025";
}

@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemTypeLinker.TREASURE_RING, 1));
List<String> pattern = List.of(
"AAA",
"AAA",
"AAA"
);
return new ShapedRecipe(SkyBlockRecipe.RecipeType.NONE, new SkyBlockItem(ItemTypeLinker.TREASURE_ARTIFACT), ingredientMap, pattern);
}
}
21 changes: 20 additions & 1 deletion ...c/src/main/java/net/swofty/types/generic/item/items/accessories/dungeon/TreasureRing.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
package net.swofty.types.generic.item.items.accessories.dungeon;

import net.swofty.types.generic.item.ItemTypeLinker;
import net.swofty.types.generic.item.MaterialQuantifiable;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.types.generic.item.impl.DefaultCraftable;
import net.swofty.types.generic.item.impl.NotFinishedYet;
import net.swofty.types.generic.item.impl.SkyBlockRecipe;
import net.swofty.types.generic.item.impl.Talisman;
import net.swofty.types.generic.item.impl.recipes.ShapedRecipe;
import net.swofty.types.generic.user.SkyBlockPlayer;
import org.jetbrains.annotations.Nullable;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class TreasureRing implements Talisman, NotFinishedYet {
public class TreasureRing implements Talisman, NotFinishedYet, DefaultCraftable {
@Override
public List<String> getTalismanDisplay() {
return List.of("§7Grants §a+2% §7extra loot to end",
Expand All @@ -19,4 +26,16 @@ public List<String> getTalismanDisplay() {
public String getSkullTexture(@Nullable SkyBlockPlayer player, SkyBlockItem item) {
return "6a1cc5525a217a399b5b86c32f0f22dd91378874b5f44d5a383e18bc0f3bc301";
}

@Override
public SkyBlockRecipe<?> getRecipe() {
Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
ingredientMap.put('A', new MaterialQuantifiable(ItemTypeLinker.TREASURE_TALISMAN, 1));
List<String> pattern = List.of(
"AAA",
"A A",
"AAA"
);
return new ShapedRecipe(SkyBlockRecipe.RecipeType.NONE, new SkyBlockItem(ItemTypeLinker.TREASURE_RING), ingredientMap, pattern);
}
}
11 changes: 6 additions & 5 deletions .../types/generic/item/items/pet/BeePet.java → ...s/generic/item/items/pet/pets/BeePet.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package net.swofty.types.generic.item.items.pet;
package net.swofty.types.generic.item.items.pet.pets;

import net.minestom.server.particle.Particle;
import net.swofty.commons.item.Rarity;
import net.swofty.types.generic.item.SkyBlockItem;
import net.swofty.commons.item.attribute.attributes.ItemAttributePetData;
import net.swofty.types.generic.item.impl.NotFinishedYet;
import net.swofty.types.generic.item.impl.Pet;
import net.swofty.types.generic.item.items.pet.PetAbility;
import net.swofty.types.generic.skill.SkillCategories;
import net.swofty.types.generic.user.SkyBlockPlayer;
import net.swofty.commons.statistics.ItemStatistic;
Expand Down Expand Up @@ -67,7 +68,7 @@ public String getName() {

@Override
public List<String> getDescription(SkyBlockItem instance) {
return Arrays.asList("§7Grants §a+20 §7of each to your pet:",
return Arrays.asList("§7Grants §a+" + level*0.2 + " §7of each to your pet:",
"§6☘ Farming Fortune",
"§6☘ Foraging Fortune",
"§6☘ Mining Fortune"
Expand All @@ -83,7 +84,7 @@ public String getName() {

@Override
public List<String> getDescription(SkyBlockItem instance) {
return Arrays.asList("§7Grants §a+30 §7of each to your pet:",
return Arrays.asList("§7Grants §a+30" + level*0.3 + " §7of each to your pet:",
"§6☘ Farming Fortune",
"§6☘ Foraging Fortune",
"§6☘ Mining Fortune"
Expand All @@ -101,7 +102,7 @@ public String getName() {
@Override
public List<String> getDescription(SkyBlockItem instance) {
return Arrays.asList(
"§7Gain §a25% §7of received damage as §6❤",
"§7Gain §a" + level*0.2 + "% §7of received damage as §6❤",
"§6Absorption"
);
}
Expand All @@ -127,7 +128,7 @@ public ItemStatistics getBaseStatistics() {
public ItemStatistics getPerLevelStatistics(Rarity rarity) {
return ItemStatistics.builder()
.withBase(ItemStatistic.SPEED, 0.1)
.withBase(ItemStatistic.STRENGTH, 0.25)
.withBase(ItemStatistic.STRENGTH, 0.3)
.withBase(ItemStatistic.INTELLIGENCE, 0.5)
.build();
}
Expand Down
Loading

0 comments on commit 4945a88

Please sign in to comment.