Skip to content

Commit

Permalink
fix sherds
Browse files Browse the repository at this point in the history
  • Loading branch information
@AViewFromTheTop
AViewFromTheTop committed Dec 30, 2024
1 parent 6b2fca4 commit e383474
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 80 deletions.
44 changes: 0 additions & 44 deletions src/main/java/net/frozenblock/trailiertales/registry/TTDecoratedPotPatternRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,11 @@
import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.entity.DecoratedPotPattern;
import org.jetbrains.annotations.NotNull;
import java.util.Map;

public class TTDecoratedPotPatternRegistry implements DecoratedPotPatternRegistryEntrypoint {

@Override
public void registerForItems(Map<Item, ResourceKey<DecoratedPotPattern>> map) {
put(map, TTItems.AURORA_POTTERY_SHERD, "aurora");
put(map, TTItems.BAIT_POTTERY_SHERD, "bait");
put(map, TTItems.BLOOM_POTTERY_SHERD, "bloom");
put(map, TTItems.BOLT_POTTERY_SHERD, "bolt");
put(map, TTItems.BULLSEYE_POTTERY_SHERD, "bullseye");
put(map, TTItems.CARRIER_POTTERY_SHERD, "carrier");
put(map, TTItems.CLUCK_POTTERY_SHERD, "cluck");
put(map, TTItems.CRAWL_POTTERY_SHERD, "crawl");
put(map, TTItems.CRESCENT_POTTERY_SHERD, "crescent");
put(map, TTItems.CULTIVATOR_POTTERY_SHERD, "cultivator");
put(map, TTItems.DROUGHT_POTTERY_SHERD, "drought");
put(map, TTItems.ENCLOSURE_POTTERY_SHERD, "enclosure");
put(map, TTItems.ESSENCE_POTTERY_SHERD, "essence");
put(map, TTItems.EYE_POTTERY_SHERD, "eye");
put(map, TTItems.FOCUS_POTTERY_SHERD, "focus");
put(map, TTItems.FROST_POTTERY_SHERD, "frost");
put(map, TTItems.HARE_POTTERY_SHERD, "hare");
put(map, TTItems.HEIGHT_POTTERY_SHERD, "height");
put(map, TTItems.HUMP_POTTERY_SHERD, "hump");
put(map, TTItems.ILLUMINATOR_POTTERY_SHERD, "illuminator");
put(map, TTItems.INCIDENCE_POTTERY_SHERD, "incidence");
put(map, TTItems.LUMBER_POTTERY_SHERD, "lumber");
put(map, TTItems.NAVIGATOR_POTTERY_SHERD, "navigator");
put(map, TTItems.NEEDLES_POTTERY_SHERD, "needles");
put(map, TTItems.OMEN_POTTERY_SHERD, "omen");
put(map, TTItems.PLUME_POTTERY_SHERD, "plume");
put(map, TTItems.PROTECTION_POTTERY_SHERD, "protection");
put(map, TTItems.SHED_POTTERY_SHERD, "shed");
put(map, TTItems.SHINE_POTTERY_SHERD, "shine");
put(map, TTItems.SHOWER_POTTERY_SHERD, "shower");
put(map, TTItems.SPADE_POTTERY_SHERD, "spade");
put(map, TTItems.SPROUT_POTTERY_SHERD, "sprout");
put(map, TTItems.VESSEL_POTTERY_SHERD, "vessel");
put(map, TTItems.WITHER_POTTERY_SHERD, "wither");
}

@Override
public void bootstrap(Registry<DecoratedPotPattern> registry) {
register(registry, "aurora");
Expand Down Expand Up @@ -88,10 +48,6 @@ public void bootstrap(Registry<DecoratedPotPattern> registry) {
register(registry, "wither");
}

private static void put(@NotNull Map<Item, ResourceKey<DecoratedPotPattern>> map, @NotNull Item sherd, String sherdName) {
map.put(sherd, ResourceKey.create(Registries.DECORATED_POT_PATTERN, TTConstants.id(sherdName)));
}

private static void register(@NotNull Registry<DecoratedPotPattern> registry, String sherdName) {
DecoratedPotPatternRegistryEntrypoint.register(
registry,
Expand Down
72 changes: 36 additions & 36 deletions src/main/java/net/frozenblock/trailiertales/registry/TTItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,205 +60,205 @@ public class TTItems {
/**
* Don't forget to go to {@link TTDecoratedPotPatternRegistry} to register patterns!
*/
public static final Item AURORA_POTTERY_SHERD = registerSherd("aurora_pottery_sherd",
public static final Item AURORA_POTTERY_SHERD = registerSherd("aurora",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item BAIT_POTTERY_SHERD = registerSherd("bait_pottery_sherd",
public static final Item BAIT_POTTERY_SHERD = registerSherd("bait",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item BLOOM_POTTERY_SHERD = registerSherd("bloom_pottery_sherd",
public static final Item BLOOM_POTTERY_SHERD = registerSherd("bloom",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item BOLT_POTTERY_SHERD = registerSherd("bolt_pottery_sherd",
public static final Item BOLT_POTTERY_SHERD = registerSherd("bolt",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item BULLSEYE_POTTERY_SHERD = registerSherd("bullseye_pottery_sherd",
public static final Item BULLSEYE_POTTERY_SHERD = registerSherd("bullseye",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item CARRIER_POTTERY_SHERD = registerSherd("carrier_pottery_sherd",
public static final Item CARRIER_POTTERY_SHERD = registerSherd("carrier",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item CLUCK_POTTERY_SHERD = registerSherd("cluck_pottery_sherd",
public static final Item CLUCK_POTTERY_SHERD = registerSherd("cluck",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item CRAWL_POTTERY_SHERD = registerSherd("crawl_pottery_sherd",
public static final Item CRAWL_POTTERY_SHERD = registerSherd("crawl",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item CRESCENT_POTTERY_SHERD = registerSherd("crescent_pottery_sherd",
public static final Item CRESCENT_POTTERY_SHERD = registerSherd("crescent",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item CULTIVATOR_POTTERY_SHERD = registerSherd("cultivator_pottery_sherd",
public static final Item CULTIVATOR_POTTERY_SHERD = registerSherd("cultivator",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item DROUGHT_POTTERY_SHERD = registerSherd("drought_pottery_sherd",
public static final Item DROUGHT_POTTERY_SHERD = registerSherd("drought",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item ENCLOSURE_POTTERY_SHERD = registerSherd("enclosure_pottery_sherd",
public static final Item ENCLOSURE_POTTERY_SHERD = registerSherd("enclosure",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item ESSENCE_POTTERY_SHERD = registerSherd("essence_pottery_sherd",
public static final Item ESSENCE_POTTERY_SHERD = registerSherd("essence",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item EYE_POTTERY_SHERD = registerSherd("eye_pottery_sherd",
public static final Item EYE_POTTERY_SHERD = registerSherd("eye",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item FOCUS_POTTERY_SHERD = registerSherd("focus_pottery_sherd",
public static final Item FOCUS_POTTERY_SHERD = registerSherd("focus",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item FROST_POTTERY_SHERD = registerSherd("frost_pottery_sherd",
public static final Item FROST_POTTERY_SHERD = registerSherd("frost",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item HARE_POTTERY_SHERD = registerSherd("hare_pottery_sherd",
public static final Item HARE_POTTERY_SHERD = registerSherd("hare",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item HEIGHT_POTTERY_SHERD = registerSherd("height_pottery_sherd",
public static final Item HEIGHT_POTTERY_SHERD = registerSherd("height",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item HUMP_POTTERY_SHERD = registerSherd("hump_pottery_sherd",
public static final Item HUMP_POTTERY_SHERD = registerSherd("hump",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item ILLUMINATOR_POTTERY_SHERD = registerSherd("illuminator_pottery_sherd",
public static final Item ILLUMINATOR_POTTERY_SHERD = registerSherd("illuminator",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item INCIDENCE_POTTERY_SHERD = registerSherd("incidence_pottery_sherd",
public static final Item INCIDENCE_POTTERY_SHERD = registerSherd("incidence",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item LUMBER_POTTERY_SHERD = registerSherd("lumber_pottery_sherd",
public static final Item LUMBER_POTTERY_SHERD = registerSherd("lumber",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item NAVIGATOR_POTTERY_SHERD = registerSherd("navigator_pottery_sherd",
public static final Item NAVIGATOR_POTTERY_SHERD = registerSherd("navigator",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item NEEDLES_POTTERY_SHERD = registerSherd("needles_pottery_sherd",
public static final Item NEEDLES_POTTERY_SHERD = registerSherd("needles",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item OMEN_POTTERY_SHERD = registerSherd("omen_pottery_sherd",
public static final Item OMEN_POTTERY_SHERD = registerSherd("omen",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item PLUME_POTTERY_SHERD = registerSherd("plume_pottery_sherd",
public static final Item PLUME_POTTERY_SHERD = registerSherd("plume",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item PROTECTION_POTTERY_SHERD = registerSherd("protection_pottery_sherd",
public static final Item PROTECTION_POTTERY_SHERD = registerSherd("protection",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item SHED_POTTERY_SHERD = registerSherd("shed_pottery_sherd",
public static final Item SHED_POTTERY_SHERD = registerSherd("shed",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item SHINE_POTTERY_SHERD = registerSherd("shine_pottery_sherd",
public static final Item SHINE_POTTERY_SHERD = registerSherd("shine",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item SHOWER_POTTERY_SHERD = registerSherd("shower_pottery_sherd",
public static final Item SHOWER_POTTERY_SHERD = registerSherd("shower",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item SPADE_POTTERY_SHERD = registerSherd("spade_pottery_sherd",
public static final Item SPADE_POTTERY_SHERD = registerSherd("spade",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item SPROUT_POTTERY_SHERD = registerSherd("sprout_pottery_sherd",
public static final Item SPROUT_POTTERY_SHERD = registerSherd("sprout",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item VESSEL_POTTERY_SHERD = registerSherd("vessel_pottery_sherd",
public static final Item VESSEL_POTTERY_SHERD = registerSherd("vessel",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
.requiredFeatures(TTFeatureFlags.FEATURE_FLAG)
);
public static final Item WITHER_POTTERY_SHERD = registerSherd("wither_pottery_sherd",
public static final Item WITHER_POTTERY_SHERD = registerSherd("wither",
Item::new,
new Properties()
.rarity(Rarity.UNCOMMON)
Expand Down Expand Up @@ -340,8 +340,8 @@ public static void init() {
}

private static @NotNull <T extends Item> T registerSherd(String name, @NotNull Function<Properties, Item> function, Item.@NotNull Properties properties) {
T item = (T) Items.registerItem(ResourceKey.create(Registries.ITEM, TTConstants.id(name)), function, properties);
SherdRegistry.register(item, TTConstants.id(name.replace("sherd", "pattern")));
T item = (T) Items.registerItem(ResourceKey.create(Registries.ITEM, TTConstants.id(name + "_pottery_sherd")), function, properties);
SherdRegistry.register(item, TTConstants.id(name));
return item;
}

Expand Down

0 comments on commit e383474

Please sign in to comment.