Skip to content

Commit

Permalink
add Ender Jellyfish and Window painting
Browse files Browse the repository at this point in the history
  • Loading branch information
luxtracon committed Sep 19, 2024
1 parent 4ad02d5 commit dd6c887
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 2 deletions.
1 change: 1 addition & 0 deletions LOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Additions
- add Crocotta, a new monster that spawns in the dark during night, hunts in packs and drops new loot
- add Raw and Cooked Crocotta Meat, two new meat variants dropped from the Crocotta
- add the Crocotta Skull that can be obtained as a rare drop
- add two new paintings, Ender Jellyfish and Window
- add a recipe to craft Packed Mud with Spelt
- add a recipe to craft Crafter with Icaria crafting tables
- add subtitles for sounds, e.g. a Catoblepas uses vanilla sounds and therefore displays unfitting subtitles like "Cow moos" which is changed to the fitting subtitle "Catoblepas moos" now, also custom sounds are fitted with subtitles now, e.g. a Grinder grinding uses custom sounds but had no subtitles registered with them which is also changed now, this applies to all blocks, entities and items that have sounds tied to them
4 changes: 4 additions & 0 deletions src/generated/resources/assets/landsoficaria/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,8 @@
"painting.landsoficaria.bridge.title": "Brücke",
"painting.landsoficaria.cactus.author": "Axanthic Studios",
"painting.landsoficaria.cactus.title": "Kaktus",
"painting.landsoficaria.ender_jellyfish.author": "Axanthic Studios",
"painting.landsoficaria.ender_jellyfish.title": "Enderqualle",
"painting.landsoficaria.moons.author": "Axanthic Studios",
"painting.landsoficaria.moons.title": "Monde",
"painting.landsoficaria.perfection.author": "Axanthic Studios",
Expand All @@ -1033,6 +1035,8 @@
"painting.landsoficaria.portal.title": "Portal",
"painting.landsoficaria.pyro.author": "Axanthic Studios",
"painting.landsoficaria.pyro.title": "Pyro",
"painting.landsoficaria.window.author": "Axanthic Studios",
"painting.landsoficaria.window.title": "Fenster",
"screen.landsoficaria.chest_label": "Kistenetikett",
"subtitle.landsoficaria.aeternae.ambient": "Äterne muht",
"subtitle.landsoficaria.aeternae.death": "Äterne stirbt",
Expand Down
4 changes: 4 additions & 0 deletions src/generated/resources/assets/landsoficaria/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,8 @@
"painting.landsoficaria.bridge.title": "Bridge",
"painting.landsoficaria.cactus.author": "Axanthic Studios",
"painting.landsoficaria.cactus.title": "Cactus",
"painting.landsoficaria.ender_jellyfish.author": "Axanthic Studios",
"painting.landsoficaria.ender_jellyfish.title": "Ender Jellyfish",
"painting.landsoficaria.moons.author": "Axanthic Studios",
"painting.landsoficaria.moons.title": "Moons",
"painting.landsoficaria.perfection.author": "Axanthic Studios",
Expand All @@ -1033,6 +1035,8 @@
"painting.landsoficaria.portal.title": "Portal",
"painting.landsoficaria.pyro.author": "Axanthic Studios",
"painting.landsoficaria.pyro.title": "Pyro",
"painting.landsoficaria.window.author": "Axanthic Studios",
"painting.landsoficaria.window.title": "Window",
"screen.landsoficaria.chest_label": "Chest Label",
"subtitle.landsoficaria.aeternae.ambient": "Aeternae moos",
"subtitle.landsoficaria.aeternae.death": "Aeternae dies",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"asset_id": "landsoficaria:ender_jellyfish",
"height": 2,
"width": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"asset_id": "landsoficaria:window",
"height": 1,
"width": 2
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"values": [
"landsoficaria:bridge",
"landsoficaria:cactus",
"landsoficaria:ender_jellyfish",
"landsoficaria:moons",
"landsoficaria:perfection",
"landsoficaria:portal",
"landsoficaria:pyro"
"landsoficaria:pyro",
"landsoficaria:window"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,22 @@
public class IcariaPaintingVariants {
public static final ResourceKey<PaintingVariant> BRIDGE = IcariaPaintingVariants.createKey("bridge");
public static final ResourceKey<PaintingVariant> CACTUS = IcariaPaintingVariants.createKey("cactus");
public static final ResourceKey<PaintingVariant> ENDER_JELLYFISH = IcariaPaintingVariants.createKey("ender_jellyfish");
public static final ResourceKey<PaintingVariant> MOONS = IcariaPaintingVariants.createKey("moons");
public static final ResourceKey<PaintingVariant> PERFECTION = IcariaPaintingVariants.createKey("perfection");
public static final ResourceKey<PaintingVariant> PORTAL = IcariaPaintingVariants.createKey("portal");
public static final ResourceKey<PaintingVariant> PYRO = IcariaPaintingVariants.createKey("pyro");
public static final ResourceKey<PaintingVariant> WINDOW = IcariaPaintingVariants.createKey("window");

public static void bootstrap(BootstrapContext<PaintingVariant> pContext) {
pContext.register(IcariaPaintingVariants.BRIDGE, new PaintingVariant(2, 2, IcariaPaintingVariants.BRIDGE.location()));
pContext.register(IcariaPaintingVariants.CACTUS, new PaintingVariant(1, 1, IcariaPaintingVariants.CACTUS.location()));
pContext.register(IcariaPaintingVariants.ENDER_JELLYFISH, new PaintingVariant(1, 2, IcariaPaintingVariants.ENDER_JELLYFISH.location()));
pContext.register(IcariaPaintingVariants.MOONS, new PaintingVariant(2, 1, IcariaPaintingVariants.MOONS.location()));
pContext.register(IcariaPaintingVariants.PERFECTION, new PaintingVariant(2, 2, IcariaPaintingVariants.PERFECTION.location()));
pContext.register(IcariaPaintingVariants.PORTAL, new PaintingVariant(2, 2, IcariaPaintingVariants.PORTAL.location()));
pContext.register(IcariaPaintingVariants.PYRO, new PaintingVariant(1, 2, IcariaPaintingVariants.PYRO.location()));
pContext.register(IcariaPaintingVariants.WINDOW, new PaintingVariant(2, 1, IcariaPaintingVariants.WINDOW.location()));
}

public static ResourceKey<PaintingVariant> createKey(String pName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1135,17 +1135,21 @@ public void addTranslations() {

this.add("painting" + "." + IcariaIdents.ID + "." + "bridge" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "cactus" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "ender_jellyfish" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "moons" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "perfection" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "portal" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "pyro" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "window" + "." + "author", "Axanthic Studios");

this.add("painting" + "." + IcariaIdents.ID + "." + "bridge" + "." + "title", "Bridge");
this.add("painting" + "." + IcariaIdents.ID + "." + "cactus" + "." + "title", "Cactus");
this.add("painting" + "." + IcariaIdents.ID + "." + "ender_jellyfish" + "." + "title", "Ender Jellyfish");
this.add("painting" + "." + IcariaIdents.ID + "." + "moons" + "." + "title", "Moons");
this.add("painting" + "." + IcariaIdents.ID + "." + "perfection" + "." + "title", "Perfection");
this.add("painting" + "." + IcariaIdents.ID + "." + "portal" + "." + "title", "Portal");
this.add("painting" + "." + IcariaIdents.ID + "." + "pyro" + "." + "title", "Pyro");
this.add("painting" + "." + IcariaIdents.ID + "." + "window" + "." + "title", "Window");

this.add("screen" + "." + IcariaIdents.ID + "." + "chest_label", "Chest Label");

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/axanthic/icaria/data/lang/IcariaGerman.java
Original file line number Diff line number Diff line change
Expand Up @@ -1135,17 +1135,21 @@ public void addTranslations() {

this.add("painting" + "." + IcariaIdents.ID + "." + "bridge" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "cactus" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "ender_jellyfish" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "moons" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "perfection" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "portal" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "pyro" + "." + "author", "Axanthic Studios");
this.add("painting" + "." + IcariaIdents.ID + "." + "window" + "." + "author", "Axanthic Studios");

this.add("painting" + "." + IcariaIdents.ID + "." + "bridge" + "." + "title", "Brücke");
this.add("painting" + "." + IcariaIdents.ID + "." + "cactus" + "." + "title", "Kaktus");
this.add("painting" + "." + IcariaIdents.ID + "." + "ender_jellyfish" + "." + "title", "Enderqualle");
this.add("painting" + "." + IcariaIdents.ID + "." + "moons" + "." + "title", "Monde");
this.add("painting" + "." + IcariaIdents.ID + "." + "perfection" + "." + "title", "Perfektion");
this.add("painting" + "." + IcariaIdents.ID + "." + "portal" + "." + "title", "Portal");
this.add("painting" + "." + IcariaIdents.ID + "." + "pyro" + "." + "title", "Pyro");
this.add("painting" + "." + IcariaIdents.ID + "." + "window" + "." + "title", "Fenster");

this.add("screen" + "." + IcariaIdents.ID + "." + "chest_label", "Kistenetikett");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ protected void addTags(HolderLookup.Provider pProvider) {
this.tag(IcariaPaintingVariantTags.PLACEABLE)
.add(IcariaPaintingVariants.BRIDGE)
.add(IcariaPaintingVariants.CACTUS)
.add(IcariaPaintingVariants.ENDER_JELLYFISH)
.add(IcariaPaintingVariants.MOONS)
.add(IcariaPaintingVariants.PERFECTION)
.add(IcariaPaintingVariants.PORTAL)
.add(IcariaPaintingVariants.PYRO);
.add(IcariaPaintingVariants.PYRO)
.add(IcariaPaintingVariants.WINDOW);
}

public static TagKey<PaintingVariant> bind(String pName) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dd6c887

Please sign in to comment.