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.

Sign up for GitHub

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

chore: rename crafter to autocrafter #694

Merged
merged 1 commit into from
Oct 4, 2024
Merged

chore: rename crafter to autocrafter #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions .idea/dictionaries/refinedstorage.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Added

- Crafter
- Autocrafter

### Changed

Expand All @@ -32,6 +32,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- The numbers on the crafting preview screen are now compacted with units.
- When requesting autocrafting multiple resources at once, which can happen via a recipe mod, all the crafting requests are now listed on the side of the GUI.
- You can now request autocrafting from the Storage Monitor if the resource count reaches zero.
- The Crafter has been renamed to "Autocrafter".

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion ...storage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public interface Grid extends AutocraftingPreviewProvider {

List<TrackedResourceAmount> getResources(Class<? extends Actor> actorType);

Set<PlatformResourceKey> getCraftableResources();
Set<PlatformResourceKey> getAutocraftableResources();

GridOperations createOperations(ResourceType resourceType, ServerPlayer player);
}
12 changes: 6 additions & 6 deletions ...ava/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ public abstract class AbstractPlatformGridResource<T extends PlatformResourceKey
protected final T resource;
private final String name;
private final Map<GridResourceAttributeKey, Set<String>> attributes;
private final boolean craftable;
private final boolean autocraftable;

protected AbstractPlatformGridResource(final T resource,
final String name,
final Map<GridResourceAttributeKey, Set<String>> attributes,
final boolean craftable) {
final boolean autocraftable) {
this.resource = resource;
this.name = name;
this.attributes = attributes;
this.craftable = craftable;
this.autocraftable = autocraftable;
}

@Override
Expand All @@ -51,8 +51,8 @@ public Set<String> getAttribute(final GridResourceAttributeKey key) {
}

@Override
public boolean isCraftable() {
return craftable;
public boolean isAutocraftable() {
return autocraftable;
}

@Nullable
Expand All @@ -67,7 +67,7 @@ public String toString() {
+ "resource=" + resource
+ ", name='" + name + '\''
+ ", attributes=" + attributes
+ ", craftable=" + craftable
+ ", autocraftable=" + autocraftable
+ '}';
}
}
2 changes: 1 addition & 1 deletion ...rc/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface ResourceType {

double getDisplayAmount(long amount);

Optional<GridResource> toGridResource(ResourceKey resource, boolean craftable);
Optional<GridResource> toGridResource(ResourceKey resource, boolean autocraftable);

long getInterfaceExportLimit();

Expand Down
56 changes: 56 additions & 0 deletions ...storage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"variants": {
"active=false,direction=down": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 180
},
"active=false,direction=east": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 90
},
"active=false,direction=north": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90
},
"active=false,direction=south": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 180
},
"active=false,direction=up": {
"model": "refinedstorage:block/autocrafter/inactive"
},
"active=false,direction=west": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 270
},
"active=true,direction=down": {
"model": "refinedstorage:block/autocrafter/light_blue",
"x": 180
},
"active=true,direction=east": {
"model": "refinedstorage:block/autocrafter/light_blue",
"x": 90,
"y": 90
},
"active=true,direction=north": {
"model": "refinedstorage:block/autocrafter/light_blue",
"x": 90
},
"active=true,direction=south": {
"model": "refinedstorage:block/autocrafter/light_blue",
"x": 90,
"y": 180
},
"active=true,direction=up": {
"model": "refinedstorage:block/autocrafter/light_blue"
},
"active=true,direction=west": {
"model": "refinedstorage:block/autocrafter/light_blue",
"x": 90,
"y": 270
}
}
}
56 changes: 56 additions & 0 deletions ...e-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"variants": {
"active=false,direction=down": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 180
},
"active=false,direction=east": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 90
},
"active=false,direction=north": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90
},
"active=false,direction=south": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 180
},
"active=false,direction=up": {
"model": "refinedstorage:block/autocrafter/inactive"
},
"active=false,direction=west": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 270
},
"active=true,direction=down": {
"model": "refinedstorage:block/autocrafter/black",
"x": 180
},
"active=true,direction=east": {
"model": "refinedstorage:block/autocrafter/black",
"x": 90,
"y": 90
},
"active=true,direction=north": {
"model": "refinedstorage:block/autocrafter/black",
"x": 90
},
"active=true,direction=south": {
"model": "refinedstorage:block/autocrafter/black",
"x": 90,
"y": 180
},
"active=true,direction=up": {
"model": "refinedstorage:block/autocrafter/black"
},
"active=true,direction=west": {
"model": "refinedstorage:block/autocrafter/black",
"x": 90,
"y": 270
}
}
}
24 changes: 12 additions & 12 deletions ...inedstorage/blockstates/blue_crafter.json → ...storage/blockstates/blue_autocrafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"variants": {
"active=false,direction=down": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 180
},
"active=false,direction=east": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 90
},
"active=false,direction=north": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90
},
"active=false,direction=south": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 180
},
"active=false,direction=up": {
"model": "refinedstorage:block/crafter/inactive"
"model": "refinedstorage:block/autocrafter/inactive"
},
"active=false,direction=west": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 270
},
"active=true,direction=down": {
"model": "refinedstorage:block/crafter/blue",
"model": "refinedstorage:block/autocrafter/blue",
"x": 180
},
"active=true,direction=east": {
"model": "refinedstorage:block/crafter/blue",
"model": "refinedstorage:block/autocrafter/blue",
"x": 90,
"y": 90
},
"active=true,direction=north": {
"model": "refinedstorage:block/crafter/blue",
"model": "refinedstorage:block/autocrafter/blue",
"x": 90
},
"active=true,direction=south": {
"model": "refinedstorage:block/crafter/blue",
"model": "refinedstorage:block/autocrafter/blue",
"x": 90,
"y": 180
},
"active=true,direction=up": {
"model": "refinedstorage:block/crafter/blue"
"model": "refinedstorage:block/autocrafter/blue"
},
"active=true,direction=west": {
"model": "refinedstorage:block/crafter/blue",
"model": "refinedstorage:block/autocrafter/blue",
"x": 90,
"y": 270
}
Expand Down
56 changes: 56 additions & 0 deletions ...e-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"variants": {
"active=false,direction=down": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 180
},
"active=false,direction=east": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 90
},
"active=false,direction=north": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90
},
"active=false,direction=south": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 180
},
"active=false,direction=up": {
"model": "refinedstorage:block/autocrafter/inactive"
},
"active=false,direction=west": {
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 270
},
"active=true,direction=down": {
"model": "refinedstorage:block/autocrafter/brown",
"x": 180
},
"active=true,direction=east": {
"model": "refinedstorage:block/autocrafter/brown",
"x": 90,
"y": 90
},
"active=true,direction=north": {
"model": "refinedstorage:block/autocrafter/brown",
"x": 90
},
"active=true,direction=south": {
"model": "refinedstorage:block/autocrafter/brown",
"x": 90,
"y": 180
},
"active=true,direction=up": {
"model": "refinedstorage:block/autocrafter/brown"
},
"active=true,direction=west": {
"model": "refinedstorage:block/autocrafter/brown",
"x": 90,
"y": 270
}
}
}
24 changes: 12 additions & 12 deletions ...nedstorage/blockstates/brown_crafter.json → ...storage/blockstates/cyan_autocrafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"variants": {
"active=false,direction=down": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 180
},
"active=false,direction=east": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 90
},
"active=false,direction=north": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90
},
"active=false,direction=south": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 180
},
"active=false,direction=up": {
"model": "refinedstorage:block/crafter/inactive"
"model": "refinedstorage:block/autocrafter/inactive"
},
"active=false,direction=west": {
"model": "refinedstorage:block/crafter/inactive",
"model": "refinedstorage:block/autocrafter/inactive",
"x": 90,
"y": 270
},
"active=true,direction=down": {
"model": "refinedstorage:block/crafter/brown",
"model": "refinedstorage:block/autocrafter/cyan",
"x": 180
},
"active=true,direction=east": {
"model": "refinedstorage:block/crafter/brown",
"model": "refinedstorage:block/autocrafter/cyan",
"x": 90,
"y": 90
},
"active=true,direction=north": {
"model": "refinedstorage:block/crafter/brown",
"model": "refinedstorage:block/autocrafter/cyan",
"x": 90
},
"active=true,direction=south": {
"model": "refinedstorage:block/crafter/brown",
"model": "refinedstorage:block/autocrafter/cyan",
"x": 90,
"y": 180
},
"active=true,direction=up": {
"model": "refinedstorage:block/crafter/brown"
"model": "refinedstorage:block/autocrafter/cyan"
},
"active=true,direction=west": {
"model": "refinedstorage:block/crafter/brown",
"model": "refinedstorage:block/autocrafter/cyan",
"x": 90,
"y": 270
}
Expand Down
Loading
Loading