Skip to content
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.

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

Backport Froglights + Additional Froglights #48

Merged
merged 8 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions src/main/java/team/chisel/Features.java
Original file line number Diff line number Diff line change
Expand Up @@ -4302,6 +4302,39 @@ void addRecipes() {
boolean needsMetaRecipes() {
return true;
}
},

FROGLIGHT {

@Override
void addBlocks() {
BlockCarvable froglight = (BlockCarvable) new BlockCarvable()
.setCreativeTab(ChiselTabs.tabOtherChiselBlocks)
.setHardness(1F)
.setLightLevel(1.0F)
.setStepSound(Block.soundTypeStone);

for (int i = 0; i < 10; i++) {
froglight.carverHelper.addVariation("tile.froglight." + i + ".desc", i, "froglight/" + i);
}

froglight.carverHelper.registerAll(froglight, "froglight");
}

@Override
void addRecipes() {
GameRegistry.addRecipe(
new ItemStack(ChiselBlocks.froglight, 8, 0),
"SGS",
"BSB",
"SGS",
'S',
new ItemStack(Blocks.stone, 1, 0),
'G',
new ItemStack(Items.glowstone_dust, 1),
'B',
new ItemStack(Items.slime_ball, 1));
}
};

private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple",
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/team/chisel/init/ChiselBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,8 @@ public final class ChiselBlocks {
// 1.9... drull pls
public static final BlockCarvable purpur = null;

// 1.19, skipped 10 versions but thats fine
public static final BlockCarvable froglight = null;

private ChiselBlocks() {}
}
13 changes: 13 additions & 0 deletions src/main/resources/assets/chisel/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1878,3 +1878,16 @@ tile.glotek.12.desc=Cranberry
tile.glotek.13.desc=Brink Pink
tile.glotek.14.desc=Dark Salmon
tile.glotek.15.desc=Harvest Gold

#Froglight
tile.chisel.froglight.name=Froglight
tile.froglight.0.desc=Aluminium
tile.froglight.1.desc=Titanium
tile.froglight.2.desc=Tungstensteel
tile.froglight.3.desc=Osmium
tile.froglight.4.desc=Fluxed
tile.froglight.5.desc=Uranium
tile.froglight.6.desc=Girisium
tile.froglight.7.desc=Orundum
tile.froglight.8.desc=Blood-Stained
tile.froglight.9.desc=Ichor
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.
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.
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.
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.
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.