File tree Expand file tree Collapse file tree 3 files changed +18
-9
lines changed Expand file tree Collapse file tree 3 files changed +18
-9
lines changed Original file line number Diff line number Diff line change @@ -280,12 +280,12 @@ public Registration getRegistration(BlockState state) {
280
280
static Map <String , String > extraMappings = new HashMap <>();
281
281
282
282
static {
283
- extraMappings .put ("17:4" , "minecraft:acacia ;pillar_axis=y" );
284
- extraMappings .put ("17:12" , "minecraft:acacia ;pillar_axis=x" );
285
- extraMappings .put ("17:20" , "minecraft:acacia ;pillar_axis=z" );
286
- extraMappings .put ("17:5" , "minecraft:dark_oak ;pillar_axis=y" );
287
- extraMappings .put ("17:13" , "minecraft:dark_oak ;pillar_axis=x" );
288
- extraMappings .put ("17:21" , "minecraft:dark_oak ;pillar_axis=z" );
283
+ extraMappings .put ("17:4" , "minecraft:acacia_log ;pillar_axis=y" );
284
+ extraMappings .put ("17:12" , "minecraft:acacia_log ;pillar_axis=x" );
285
+ extraMappings .put ("17:20" , "minecraft:acacia_log ;pillar_axis=z" );
286
+ extraMappings .put ("17:5" , "minecraft:dark_oak_log ;pillar_axis=y" );
287
+ extraMappings .put ("17:13" , "minecraft:dark_oak_log ;pillar_axis=x" );
288
+ extraMappings .put ("17:21" , "minecraft:dark_oak_log ;pillar_axis=z" );
289
289
}
290
290
291
291
private Registration findRegistration (final BlockState state ) {
Original file line number Diff line number Diff line change @@ -41,8 +41,11 @@ protected boolean exec() {
41
41
if (regionLoader .chunkExists (i , j )) {
42
42
try {
43
43
Chunk chunk = (Chunk ) regionLoader .readChunk (i , j );
44
- chunk .initChunk ();
45
- levelDBStorage .writeChunk (chunk , dimensionData );
44
+ if (chunk != null ) {
45
+ chunk .initChunk ();
46
+ levelDBStorage .writeChunk (chunk , dimensionData );
47
+ }
48
+ chunk = null ;
46
49
} catch (IOException e ) {
47
50
throw new RuntimeException (e );
48
51
}
@@ -51,6 +54,11 @@ protected boolean exec() {
51
54
}
52
55
}
53
56
} // progress bar stops automatically after completion of try-with-resource block
57
+ try {
58
+ regionLoader .close ();
59
+ } catch (IOException e ) {
60
+ throw new RuntimeException (e );
61
+ }
54
62
return true ;
55
63
}
56
64
}
Original file line number Diff line number Diff line change @@ -302,7 +302,8 @@ public int getNetworkId(Item item) {
302
302
runtimeEntry = legacy2Runtime .get (RuntimeItems .getFullId (item .getId (), 0 ));
303
303
}
304
304
if (runtimeEntry == null ) {
305
- throw new IllegalArgumentException ("Unknown item mapping " + item );
305
+ log .warn ("Unknown item mapping " + item );
306
+ return item .getId ();
306
307
}
307
308
return runtimeEntry .runtimeId ;
308
309
}
You can’t perform that action at this time.
0 commit comments