Skip to content

Commit 32e51fa

Browse files
committed
fixed the naming
1 parent c8a819f commit 32e51fa

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/MapWrapperMeta.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,15 @@ public BuildMapView getExistingMapView(final int id, @Nonnull final Consumer<Bui
103103
*/
104104
@Nullable
105105
public BuildMapView createOrRetrieveMapView(@Nullable final World world, final int id, @Nonnull final Consumer<BuildMapView> action) {
106-
MapView mapView = null;
106+
MapView mapView = (id >= 0) ? ItemCreator.getMapById(id) : null;
107107

108-
if (id >= 0) {
109-
mapView = ItemCreator.getMapById(id);
110-
}
111108
if (mapView == null) {
112109
if (world == null) return null;
113110
mapView = Bukkit.createMap(world);
114111
}
115-
this.mapView = new BuildMapView(mapView);
116-
action.accept(this.mapView);
117-
return this.mapView;
112+
final BuildMapView builtMapView = this.assignMapView(new BuildMapView(mapView));
113+
action.accept(builtMapView);
114+
return builtMapView;
118115
}
119116

120117
/**
@@ -123,7 +120,7 @@ public BuildMapView createOrRetrieveMapView(@Nullable final World world, final i
123120
* @param buildMapView new instance of {@link BuildMapView} to wrap (non-null)
124121
* @return the newly created {@link BuildMapView} instance wrapping the given map view.
125122
*/
126-
public BuildMapView createMapView(@Nonnull final BuildMapView buildMapView) {
123+
public BuildMapView assignMapView(@Nonnull final BuildMapView buildMapView) {
127124
this.mapView = buildMapView;
128125
return buildMapView;
129126
}

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/serialization/itemstack/SerializeItem.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ public org.broken.arrow.library.itemcreator.meta.BookMeta getBookMenta() {
361361
*/
362362
@Nullable
363363
public MapWrapperMeta getMapViewMeta() {
364+
this.mapViewMeta.createMapView()
364365
return mapViewMeta;
365366
}
366367

@@ -538,7 +539,7 @@ private static void retrieveMapData(@Nonnull final ItemStack item, @Nonnull fina
538539
final MapWrapperMeta mapMetaWrapper = new MapWrapperMeta();
539540
final BuildMapView buildMapView = new BuildMapView(mapView);
540541
buildMapView.addAllRenderers(mapView.getRenderers());
541-
mapMetaWrapper.createMapView(buildMapView);
542+
mapMetaWrapper.assignMapView(buildMapView);
542543
data.mapViewMeta = mapMetaWrapper;
543544
}
544545
} else {
@@ -548,7 +549,7 @@ private static void retrieveMapData(@Nonnull final ItemStack item, @Nonnull fina
548549
final MapWrapperMeta mapMetaWrapper = new MapWrapperMeta();
549550
final BuildMapView buildMapView = new BuildMapView(mapView);
550551
buildMapView.addAllRenderers(mapView.getRenderers());
551-
mapMetaWrapper.createMapView(buildMapView);
552+
mapMetaWrapper.assignMapView(buildMapView);
552553
data.mapViewMeta = mapMetaWrapper;
553554
}
554555
}

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/serialization/typeadapter/MapMetaAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public MapWrapperMeta read(final JsonReader in) throws IOException {
116116
buildMapView.setTrackingPosition(mapViewValues.trackingPosition);
117117
buildMapView.setUnlimitedTracking(mapViewValues.unlimitedTracking);
118118

119-
meta.createMapView(buildMapView);
119+
meta.assignMapView(buildMapView);
120120
}
121121
json.endObject();
122122
return meta;

0 commit comments

Comments
 (0)