Skip to content

Commit

Permalink
Renamed LootItem to RelicItem, changing registry names of all relics.
Browse files Browse the repository at this point in the history 
Fixed remaining places where brooch was still called broach
  • Loading branch information
@GirafiStudios
GirafiStudios committed Oct 25, 2020
1 parent aa6bc8e commit 22d967d
Show file tree
Hide file tree
Showing 61 changed files with 362 additions and 362 deletions.
34 changes: 17 additions & 17 deletions src/main/java/com/teammetallurgy/atum/entity/efreet/SunspeakerEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.teammetallurgy.atum.entity.ai.brain.SunspeakerTradeTask;
import com.teammetallurgy.atum.entity.undead.PharaohEntity;
import com.teammetallurgy.atum.init.*;
import com.teammetallurgy.atum.items.LootItem;
import com.teammetallurgy.atum.items.RelicItem;
import com.teammetallurgy.atum.items.tools.ScepterItem;
import com.teammetallurgy.atum.misc.StackHelper;
import net.minecraft.block.Blocks;
Expand Down Expand Up @@ -455,7 +455,7 @@ public ActionResultType func_230254_b_(PlayerEntity player, @Nonnull Hand hand)
if (nameTag) {
heldStack.interactWithEntity(player, this, hand);
return ActionResultType.SUCCESS;
} else if (!(heldStack.getItem() instanceof LootItem) && !(heldStack.getItem() instanceof SpawnEggItem) && this.isAlive() && !this.hasCustomer() && !this.isSleeping() && !player.isSecondaryUseActive()) {
} else if (!(heldStack.getItem() instanceof RelicItem) && !(heldStack.getItem() instanceof SpawnEggItem) && this.isAlive() && !this.hasCustomer() && !this.isSleeping() && !player.isSecondaryUseActive()) {
if (this.isChild()) {
this.shakeHead();
return ActionResultType.func_233537_a_(this.world.isRemote);
Expand Down Expand Up @@ -487,9 +487,9 @@ public ActionResultType func_230254_b_(PlayerEntity player, @Nonnull Hand hand)
return ActionResultType.SUCCESS;
}
}
} else if (heldStack.getItem() instanceof LootItem) {
LootItem.Type type = LootItem.getType(heldStack.getItem());
LootItem.Quality quality = LootItem.getQuality(heldStack.getItem());
} else if (heldStack.getItem() instanceof RelicItem) {
RelicItem.Type type = RelicItem.getType(heldStack.getItem());
RelicItem.Quality quality = RelicItem.getQuality(heldStack.getItem());

if (isAgressiveTowards) {
this.angerTargetUUID = null;
Expand All @@ -502,15 +502,15 @@ public ActionResultType func_230254_b_(PlayerEntity player, @Nonnull Hand hand)
return ActionResultType.SUCCESS;
} else {

if (quality != LootItem.Quality.DIRTY) {
if (quality != RelicItem.Quality.DIRTY) {
double modifier = 1.0D;
if (type == LootItem.Type.NECKLACE) {
if (type == RelicItem.Type.NECKLACE) {
modifier = 2.0D;
} else if (type == LootItem.Type.BROOCH) {
} else if (type == RelicItem.Type.BROOCH) {
modifier = 2.5D;
} else if (type == LootItem.Type.SCEPTER) {
} else if (type == RelicItem.Type.SCEPTER) {
modifier = 3.0D;
} else if (type == LootItem.Type.IDOL) {
} else if (type == RelicItem.Type.IDOL) {
modifier = 5.0D;
}
if (!player.isCreative()) {
Expand All @@ -528,20 +528,20 @@ public ActionResultType func_230254_b_(PlayerEntity player, @Nonnull Hand hand)
}
}

private void handleRelicTrade(PlayerEntity player, Hand hand, double modifier, LootItem.Quality quality) {
private void handleRelicTrade(PlayerEntity player, Hand hand, double modifier, RelicItem.Quality quality) {
int amount = 0;

if (quality == LootItem.Quality.SILVER) {
if (quality == RelicItem.Quality.SILVER) {
amount += modifier;
} else if (quality == LootItem.Quality.GOLD) {
} else if (quality == RelicItem.Quality.GOLD) {
amount += modifier * 2;
} else if (quality == LootItem.Quality.SAPPHIRE) {
} else if (quality == RelicItem.Quality.SAPPHIRE) {
amount += modifier * 3;
} else if (quality == LootItem.Quality.RUBY) {
} else if (quality == RelicItem.Quality.RUBY) {
amount += modifier * 4;
} else if (quality == LootItem.Quality.EMERALD) {
} else if (quality == RelicItem.Quality.EMERALD) {
amount += modifier * 5;
} else if (quality == LootItem.Quality.DIAMOND) {
} else if (quality == RelicItem.Quality.DIAMOND) {
amount += modifier * 10;
}

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/teammetallurgy/atum/init/AtumItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ public class AtumItems {
public static final Item KHNUMITE = registerItem(new SimpleItem(), "khnumite");
public static final Item DIRTY_COIN = registerItem(new CoinItem(), "coin_dirty");
public static final Item GOLD_COIN = registerItem(new CoinItem(), "coin_gold");
public static final LootItem IDOL_RELICS = registerRelic(LootItem.Type.IDOL);
public static final LootItem IDOL_NECKLACES = registerRelic(LootItem.Type.NECKLACE);
public static final LootItem IDOL_RINGS = registerRelic(LootItem.Type.RING);
public static final LootItem IDOL_BROOCHES = registerRelic(LootItem.Type.BROOCH);
public static final LootItem IDOL_SCEPTERS = registerRelic(LootItem.Type.SCEPTER);
public static final RelicItem IDOL_RELICS = registerRelic(RelicItem.Type.IDOL);
public static final RelicItem IDOL_NECKLACES = registerRelic(RelicItem.Type.NECKLACE);
public static final RelicItem IDOL_RINGS = registerRelic(RelicItem.Type.RING);
public static final RelicItem IDOL_BROOCHES = registerRelic(RelicItem.Type.BROOCH);
public static final RelicItem IDOL_SCEPTERS = registerRelic(RelicItem.Type.SCEPTER);
public static final Item EFREET_HEART = registerItem(new SimpleItem(), "efreet_heart");
public static final Item SCARAB = registerItem(new ScarabItem(), "scarab");
public static final Item IDOL_OF_LABOR = registerItem(new IdolOfLaborItem(), "idol_of_labor");
Expand Down
36 changes: 18 additions & 18 deletions ...m/teammetallurgy/atum/items/LootItem.java → .../teammetallurgy/atum/items/RelicItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@

import javax.annotation.Nonnull;

public class LootItem extends Item {
public static final NonNullList<LootEntry> LOOT_ENTRIES = NonNullList.create();
public class RelicItem extends Item {
public static final NonNullList<RelicEntry> RELIC_ENTRIES = NonNullList.create();

public LootItem(Item.Properties properties) {
public RelicItem(Item.Properties properties) {
super(properties.group(Atum.GROUP));
}

public Item getLootItem(Type type, Quality quality) {
return ForgeRegistries.ITEMS.getValue(new ResourceLocation(Atum.MOD_ID, "loot_" + quality.getString() + "_" + type.getString()));
public Item getRelic(Type type, Quality quality) {
return ForgeRegistries.ITEMS.getValue(new ResourceLocation(Atum.MOD_ID, "relic_" + quality.getString() + "_" + type.getString()));
}

public static Type getType(Item item) {
if (!(item instanceof LootItem)) {
Atum.LOG.error("Item is not a loot artifact");
if (!(item instanceof RelicItem)) {
Atum.LOG.error("Item is not a relic");
} else {
for (Quality quality : Quality.values()) {
Preconditions.checkNotNull(item.getRegistryName(), "registryName");
Type type = Type.byString(item.getRegistryName().getPath().replace("loot_", "").replace(quality.getString(), "").replace("_", ""));
Type type = Type.byString(item.getRegistryName().getPath().replace("relic_", "").replace(quality.getString(), "").replace("_", ""));
if (type != null) {
return type;
}
Expand All @@ -43,12 +43,12 @@ public static Type getType(Item item) {
}

public static Quality getQuality(Item item) {
if (!(item instanceof LootItem)) {
Atum.LOG.error("Item is not a loot artifact");
if (!(item instanceof RelicItem)) {
Atum.LOG.error("Item is not a relic");
} else {
for (Type type : Type.values()) {
Preconditions.checkNotNull(item.getRegistryName(), "registryName");
Quality quality = Quality.byString(item.getRegistryName().getPath().replace("loot_", "").replace(type.getString(), "").replace("_", ""));
Quality quality = Quality.byString(item.getRegistryName().getPath().replace("relic_", "").replace(type.getString(), "").replace("_", ""));
if (quality != null) {
return quality;
}
Expand All @@ -62,9 +62,9 @@ public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entityItem) {
World world = entityItem.world;
BlockState state = world.getBlockState(new BlockPos(MathHelper.floor(entityItem.getPosX()), MathHelper.floor(entityItem.getPosY()), MathHelper.floor(entityItem.getPosZ())));
if (state.getFluidState().isTagged(FluidTags.WATER) || state.getBlock() instanceof CauldronBlock && state.get(CauldronBlock.LEVEL) > 0) {
if (stack.getItem() instanceof LootItem && String.valueOf(stack.getItem().getRegistryName()).contains("dirty") && !world.isRemote) {
if (stack.getItem() instanceof RelicItem && String.valueOf(stack.getItem().getRegistryName()).contains("dirty") && !world.isRemote) {
while (stack.getCount() > 0) {
Item item = getLootItem(getType(stack.getItem()), WeightedRandom.getRandomItem(random, LOOT_ENTRIES).quality);
Item item = getRelic(getType(stack.getItem()), WeightedRandom.getRandomItem(random, RELIC_ENTRIES).quality);
if (random.nextFloat() <= 0.10F) {
stack.shrink(1);
world.playSound(null, entityItem.getPosX(), entityItem.getPosY(), entityItem.getPosZ(), SoundEvents.ENTITY_ITEM_BREAK, entityItem.getSoundCategory(), 0.8F, 0.8F + entityItem.world.rand.nextFloat() * 0.4F);
Expand All @@ -83,7 +83,7 @@ public enum Type implements IStringSerializable {
IDOL("idol"),
NECKLACE("necklace"),
RING("ring"),
BROOCH("broach"),
BROOCH("brooch"),
SCEPTER("scepter");

private final String unlocalizedName;
Expand Down Expand Up @@ -120,9 +120,9 @@ public enum Quality implements IStringSerializable {
private final String unlocalizedName;
private final int weight;

Quality(String name, int lootWeight) {
Quality(String name, int weight) {
this.unlocalizedName = name;
this.weight = lootWeight;
this.weight = weight;
}

public static Quality byString(String name) {
Expand All @@ -145,10 +145,10 @@ public String getString() {
}
}

public static class LootEntry extends WeightedRandom.Item {
public static class RelicEntry extends WeightedRandom.Item {
final Quality quality;

public LootEntry(Quality quality, int weight) {
public RelicEntry(Quality quality, int weight) {
super(weight);
this.quality = quality;
}
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/com/teammetallurgy/atum/misc/AtumRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.teammetallurgy.atum.entity.projectile.arrow.CustomArrow;
import com.teammetallurgy.atum.entity.undead.PharaohEntity;
import com.teammetallurgy.atum.init.*;
import com.teammetallurgy.atum.items.LootItem;
import com.teammetallurgy.atum.items.RelicItem;
import com.teammetallurgy.atum.items.tools.ScepterItem;
import com.teammetallurgy.atum.misc.datagenerator.BlockStatesGenerator;
import com.teammetallurgy.atum.misc.datagenerator.RecipeGenerator;
Expand Down Expand Up @@ -71,16 +71,16 @@ public static Item registerItem(@Nonnull Item item, @Nonnull String name) {
* @param type The relic type
* @return The dirty relic item that was registered
*/
public static LootItem registerRelic(@Nonnull LootItem.Type type) {
public static RelicItem registerRelic(@Nonnull RelicItem.Type type) {
Item.Properties nonDirty = new Item.Properties().maxStackSize(16);
LootItem dirty = new LootItem(new Item.Properties().maxStackSize(64));
registerItem(dirty, getLootName(LootItem.Quality.DIRTY, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.SILVER, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.GOLD, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.SAPPHIRE, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.RUBY, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.EMERALD, type));
registerItem(new LootItem(nonDirty), getLootName(LootItem.Quality.DIAMOND, type));
RelicItem dirty = new RelicItem(new Item.Properties().maxStackSize(64));
registerItem(dirty, getRelicName(RelicItem.Quality.DIRTY, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.SILVER, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.GOLD, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.SAPPHIRE, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.RUBY, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.EMERALD, type));
registerItem(new RelicItem(nonDirty), getRelicName(RelicItem.Quality.DIAMOND, type));
return dirty;
}

Expand All @@ -90,9 +90,9 @@ public static Item registerScepter(PharaohEntity.God god) {
return AtumRegistry.registerItem(scepter, "scepter_" + god.getName());
}

private static String getLootName(@Nonnull LootItem.Quality quality, @Nonnull LootItem.Type type) {
LootItem.LOOT_ENTRIES.add(new LootItem.LootEntry(quality, quality.getWeight()));
return "loot_" + quality.getString() + "_" + type.getString();
private static String getRelicName(@Nonnull RelicItem.Quality quality, @Nonnull RelicItem.Type type) {
RelicItem.RELIC_ENTRIES.add(new RelicItem.RelicEntry(quality, quality.getWeight()));
return "relic_" + quality.getString() + "_" + type.getString();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/teammetallurgy/atum/world/gen/feature/pool/AtumVillagePools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class AtumVillagePools {

public static void init() { //TODO Make Atum specific terminor
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244106_f), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244106_f), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244106_f), 2)), JigsawPattern.PlacementBehaviour.RIGID));
public static void init() { //TODO Make Atum specific terminator
JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), new ResourceLocation("village/desert/terminators"), ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
}
}

0 comments on commit 22d967d

Please sign in to comment.