Skip to content

Commit

Permalink
Fix matter upgrader failing after world reload
Browse files Browse the repository at this point in the history
and generate assets
  • Loading branch information
DonovanDMC committed Oct 17, 2023
1 parent 0e8a60b commit 0ffc321
Show file tree
Hide file tree
Showing 129 changed files with 1,202 additions and 171 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/blue"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/cyan"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/fading"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/green"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/lime"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/magenta"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/orange"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/pink"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/purple"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/violet"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/white"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "projectexpansion:block/matter/yellow"
}
}
}
110 changes: 95 additions & 15 deletions src/generated/resources/assets/projectexpansion/lang/en_us.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/blue"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/cyan"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/fading"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/green"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/lime"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/magenta"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/orange"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/pink"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/purple"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/violet"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/white"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/matter/yellow"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/advanced_alchemical_book"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/arcane_alchemical_book"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/arcane_tablet"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/basic_alchemical_book"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/basic"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/fuel/blue"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/blue"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/matter/blue"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/drei"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/ein"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/omega"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/sphere"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/vier"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/colossal/zwei"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/fuel/cyan"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/cyan"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/matter/cyan"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/dark"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/fading"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/matter/fading"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/final"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/final"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/star/final_shard"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/fuel/green"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/green"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/matter/green"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/infinite_fuel"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/infinite_steak"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/knowledge_sharing_book"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/fuel/lime"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/matter/lime"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/matter/lime"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "projectexpansion:item/fuel/magenta"
}
Expand Down

0 comments on commit 0ffc321

Please sign in to comment.