|
21 | 21 | import com.google.common.collect.ImmutableList; |
22 | 22 | import com.google.gson.JsonObject; |
23 | 23 | import it.unimi.dsi.fastutil.ints.Int2ObjectMap; |
24 | | -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; |
25 | 24 | import lombok.Getter; |
26 | 25 | import lombok.experimental.Accessors; |
27 | 26 | import org.jetbrains.annotations.ApiStatus; |
@@ -324,43 +323,6 @@ public JsonObject toJson(JsonObject json) { |
324 | 323 | } |
325 | 324 |
|
326 | 325 | private static final ResourceLocation PIPE_BLOCKED_OVERLAY = GTCEu.id("block/pipe/blocked/pipe_blocked"); |
327 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_UP = GTCEu.id("block/pipe/blocked/pipe_blocked_up"); |
328 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_DOWN = GTCEu.id("block/pipe/blocked/pipe_blocked_down"); |
329 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_LEFT = GTCEu.id("block/pipe/blocked/pipe_blocked_left"); |
330 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_RIGHT = GTCEu |
331 | | - .id("block/pipe/blocked/pipe_blocked_right"); |
332 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_NU = GTCEu.id("block/pipe/blocked/pipe_blocked_nu"); |
333 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_ND = GTCEu.id("block/pipe/blocked/pipe_blocked_nd"); |
334 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_NL = GTCEu.id("block/pipe/blocked/pipe_blocked_nl"); |
335 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_NR = GTCEu.id("block/pipe/blocked/pipe_blocked_nr"); |
336 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_UD = GTCEu.id("block/pipe/blocked/pipe_blocked_ud"); |
337 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_UL = GTCEu.id("block/pipe/blocked/pipe_blocked_ul"); |
338 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_UR = GTCEu.id("block/pipe/blocked/pipe_blocked_ur"); |
339 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_DL = GTCEu.id("block/pipe/blocked/pipe_blocked_dl"); |
340 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_DR = GTCEu.id("block/pipe/blocked/pipe_blocked_dr"); |
341 | | - private static final ResourceLocation PIPE_BLOCKED_OVERLAY_LR = GTCEu.id("block/pipe/blocked/pipe_blocked_lr"); |
342 | | - |
343 | | - private static final Int2ObjectMap<ResourceLocation> RESTRICTOR_MAP = Util.make(() -> { |
344 | | - Int2ObjectMap<ResourceLocation> map = new Int2ObjectOpenHashMap<>(); |
345 | | - |
346 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_UP, Border.TOP); |
347 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_DOWN, Border.BOTTOM); |
348 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_UD, Border.TOP, Border.BOTTOM); |
349 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_LEFT, Border.LEFT); |
350 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_UL, Border.TOP, Border.LEFT); |
351 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_DL, Border.BOTTOM, Border.LEFT); |
352 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_NR, Border.TOP, Border.BOTTOM, Border.LEFT); |
353 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_RIGHT, Border.RIGHT); |
354 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_UR, Border.TOP, Border.RIGHT); |
355 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_DR, Border.BOTTOM, Border.RIGHT); |
356 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_NL, Border.TOP, Border.BOTTOM, Border.RIGHT); |
357 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_LR, Border.LEFT, Border.RIGHT); |
358 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_ND, Border.TOP, Border.LEFT, Border.RIGHT); |
359 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY_NU, Border.BOTTOM, Border.LEFT, Border.RIGHT); |
360 | | - addRestrictor(map, PIPE_BLOCKED_OVERLAY, Border.TOP, Border.BOTTOM, Border.LEFT, Border.RIGHT); |
361 | | - |
362 | | - return map; |
363 | | - }); |
364 | 326 |
|
365 | 327 | private static BlockModelBuilder[] getOrCreateRestrictorModels(BlockModelProvider provider, float thickness) { |
366 | 328 | return RESTRICTOR_MODEL_CACHE.apply(provider, thickness); |
|
0 commit comments