Skip to content

Commit 5872179

Browse files
committed
removed code duplication
just have the method in one place.
1 parent 6634084 commit 5872179

File tree

3 files changed

+8
-50
lines changed

3 files changed

+8
-50
lines changed

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/map/builder/RenderConfigurator.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* be called in any order, but calling multiple layer-setting methods on the same
1515
* indices may overwrite existing layers.</p>
1616
*/
17-
public class RenderConfigurator {
17+
public class RenderConfigurator extends FinalRenderStep {
1818

1919
private final MapRendererData renderer;
2020
private final MapRendererBuilder mapRendererBuilder;
@@ -26,6 +26,7 @@ public class RenderConfigurator {
2626
* @param mapRendererBuilder the builder instance used for automatic layer assignment
2727
*/
2828
public RenderConfigurator(@Nonnull final MapRendererData renderer, @Nonnull final MapRendererBuilder mapRendererBuilder) {
29+
super(mapRendererBuilder);
2930
this.renderer = renderer;
3031
this.mapRendererBuilder = mapRendererBuilder;
3132
}
@@ -60,17 +61,4 @@ public RendererStepAfterCache withCachedLayer(final int layer, final int cacheId
6061
cache.setLayerToRender(layer,cacheId ,this.renderer);
6162
return new RendererStepAfterCache(renderer, mapRendererBuilder);
6263
}
63-
64-
/**
65-
* Configures the builder for automatic layer assignment.
66-
*
67-
* <p>The builder assigns layers sequentially and is aware of existing layers,
68-
* avoiding collisions with previously configured layers. However, manual or cached
69-
* layers with custom indices may still overlap layers already set on the pixel map.</p>
70-
*
71-
* @param config a consumer configuring the {@link MapRendererBuilder} instance
72-
*/
73-
public void withBuilder(@Nonnull final Consumer<MapRendererBuilder> config) {
74-
config.accept(this.mapRendererBuilder);
75-
}
7664
}

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/map/builder/RendererStepAfter.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
*
1313
* <p>Allows optional loading of cached layers or builder configuration.</p>
1414
*/
15-
public class RendererStepAfter {
15+
public class RendererStepAfter extends FinalRenderStep {
1616

1717
private final MapRendererData renderer;
18-
private final MapRendererBuilder mapRendererBuilder;
19-
private final FinalRenderStep finalRenderStep;
2018

2119
/**
2220
* Creates a step after configuring the renderer.
@@ -25,9 +23,8 @@ public class RendererStepAfter {
2523
* @param mapRendererBuilder the builder instance used for automatic layer assignment
2624
*/
2725
public RendererStepAfter(@Nonnull final MapRendererData renderer, @Nonnull final MapRendererBuilder mapRendererBuilder) {
26+
super(mapRendererBuilder);
2827
this.renderer = renderer;
29-
this.mapRendererBuilder = mapRendererBuilder;
30-
this.finalRenderStep = new FinalRenderStep(mapRendererBuilder);
3128
}
3229

3330
/**
@@ -43,19 +40,7 @@ public RendererStepAfter(@Nonnull final MapRendererData renderer, @Nonnull final
4340
*/
4441
public FinalRenderStep withCachedLayer(final int layer, final int cacheId, @Nonnull final MapRendererDataCache cache) {
4542
cache.setLayerToRender(layer,cacheId ,this.renderer);
46-
return this.finalRenderStep;
43+
return this;
4744
}
4845

49-
/**
50-
* Configures the builder for automatic layer assignment.
51-
*
52-
* <p>The builder assigns layers sequentially and is aware of existing layers,
53-
* avoiding collisions with previously configured layers. However, manual or cached
54-
* layers with custom indices may still overlap layers already set on the pixel map.</p>
55-
*
56-
* @param config a consumer configuring the {@link MapRendererBuilder} instance
57-
*/
58-
public void withBuilder(@Nonnull final Consumer<MapRendererBuilder> config) {
59-
config.accept(this.mapRendererBuilder);
60-
}
6146
}

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/map/builder/RendererStepAfterCache.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
*
1212
* <p>Allows optional renderer configuration or builder configuration.</p>
1313
*/
14-
public class RendererStepAfterCache {
14+
public class RendererStepAfterCache extends FinalRenderStep {
1515
private final MapRendererData renderer;
16-
private final MapRendererBuilder mapRendererBuilder;
17-
private final FinalRenderStep finalRenderStep;
1816

1917
/**
2018
* Creates a step after loading a cached layer.
@@ -23,9 +21,8 @@ public class RendererStepAfterCache {
2321
* @param mapRendererBuilder the builder instance used for automatic layer assignment
2422
*/
2523
public RendererStepAfterCache(@Nonnull final MapRendererData renderer, @Nonnull final MapRendererBuilder mapRendererBuilder) {
24+
super(mapRendererBuilder);
2625
this.renderer = renderer;
27-
this.mapRendererBuilder = mapRendererBuilder;
28-
this.finalRenderStep = new FinalRenderStep(mapRendererBuilder);
2926
}
3027

3128
/**
@@ -40,19 +37,7 @@ public RendererStepAfterCache(@Nonnull final MapRendererData renderer, @Nonnull
4037
*/
4138
public FinalRenderStep withRenderer(@Nonnull final Consumer<MapRendererData> config) {
4239
config.accept(this.renderer);
43-
return this.finalRenderStep;
40+
return this;
4441
}
4542

46-
/**
47-
* Configures the builder for automatic layer assignment.
48-
*
49-
* <p>The builder assigns layers sequentially and is aware of existing layers,
50-
* avoiding collisions with previously configured layers. However, manual or cached
51-
* layers with custom indices may still overlap layers already set on the pixel map.</p>
52-
*
53-
* @param config a consumer configuring the {@link MapRendererBuilder} instance
54-
*/
55-
public void withBuilder(@Nonnull final Consumer<MapRendererBuilder> config) {
56-
config.accept(this.mapRendererBuilder);
57-
}
5843
}

0 commit comments

Comments
 (0)