Skip to content

Commit a065a4f

Browse files
committed
1 parent 6b45a2c commit a065a4f

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ javaVersion=21
1212
useJavaToolChains=true
1313

1414
#The currently running forge.
15-
forgeVersion=21.1.4
15+
forgeVersion=21.1.31
1616

1717
fml_range=[4,)
1818
forge_range=[21.0.143,)

src/main/java/com/ldtteam/common/config/AbstractConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import net.neoforged.neoforge.common.ModConfigSpec.RestartType;
1515
import net.neoforged.neoforge.common.util.LogicalSidedProvider;
1616
import org.jetbrains.annotations.Nullable;
17-
1817
import java.util.ArrayList;
1918
import java.util.Arrays;
2019
import java.util.List;

src/main/java/com/ldtteam/common/fakelevel/FakeLevel.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,15 @@ public FakeLevel(final SOURCE levelSource,
126126
final boolean overrideBeLevel)
127127
{
128128
// we have to pass null in ctor, so realLevel can be used
129-
super(new FakeLevelData(realLevel.getLevelData(),
130-
lightProvider), null, realLevel.registryAccess(), realLevel.dimensionTypeRegistration(), null, true, false, 0, 0);
129+
super(new FakeLevelData(realLevel.getLevelData(), lightProvider),
130+
realLevel.dimension(),
131+
realLevel.registryAccess(),
132+
realLevel.dimensionTypeRegistration(),
133+
realLevel.getProfilerSupplier(),
134+
true,
135+
false,
136+
0,
137+
0);
131138
this.levelSource = levelSource;
132139
this.lightProvider = lightProvider;
133140
this.realLevel = realLevel;
@@ -214,53 +221,54 @@ public void setEntities(final Collection<? extends Entity> entities)
214221
// ========================================
215222
// ======= CTOR REAL LEVEL REDIRECTS ======
216223
// ========================================
224+
// Note: must have null check because super ctor
217225

218226
@Override
219227
public ResourceKey<Level> dimension()
220228
{
221-
return realLevel().dimension();
229+
return realLevel() != null ? realLevel().dimension() : super.dimension();
222230
}
223231

224232
@Override
225233
public RegistryAccess registryAccess()
226234
{
227-
return realLevel().registryAccess();
235+
return realLevel() != null ? realLevel().registryAccess() : super.registryAccess();
228236
}
229237

230238
@Override
231239
public DamageSources damageSources()
232240
{
233-
return realLevel().damageSources();
241+
return realLevel() != null ? realLevel().damageSources() : super.damageSources();
234242
}
235243

236244
@Override
237245
public ProfilerFiller getProfiler()
238246
{
239-
return realLevel().getProfiler();
247+
return realLevel() != null ? realLevel().getProfiler() : super.getProfiler();
240248
}
241249

242250
@Override
243251
public Supplier<ProfilerFiller> getProfilerSupplier()
244252
{
245-
return realLevel().getProfilerSupplier();
253+
return realLevel() != null ? realLevel().getProfilerSupplier() : super.getProfilerSupplier();
246254
}
247255

248256
@Override
249257
public DimensionType dimensionType()
250258
{
251-
return realLevel().dimensionType();
259+
return realLevel() != null ? realLevel().dimensionType() : super.dimensionType();
252260
}
253261

254262
@Override
255263
public Holder<DimensionType> dimensionTypeRegistration()
256264
{
257-
return realLevel().dimensionTypeRegistration();
265+
return realLevel() != null ? realLevel().dimensionTypeRegistration() : super.dimensionTypeRegistration();
258266
}
259267

260268
@Override
261269
public WorldBorder getWorldBorder()
262270
{
263-
return realLevel().getWorldBorder();
271+
return realLevel() != null ? realLevel().getWorldBorder() : super.getWorldBorder();
264272
}
265273

266274
// ========================================

0 commit comments

Comments
 (0)