icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.16.2-pre3

Browse Source
This commit is contained in:
gnembon committed 2020-08-06 21:56:54 -03:00
1 parent 1a023c91be
commit 62f58f2fc4
3 files changed
+12 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=1.16.2-pre2 minecraft_version=1.16.2-pre3
yarn_mappings=1.16.2-pre2+build.1 yarn_mappings=1.16.2-pre3+build.2
loader_version=0.9.0+build.204 loader_version=0.9.0+build.204
# Mod Properties # Mod Properties
src/main/java/carpet/helpers/FeatureGenerator.java
+5 -5
View File
@@ -9,7 +9,7 @@ import net.minecraft.structure.StructureManager;
import net.minecraft.structure.StructureStart; import net.minecraft.structure.StructureStart;
import net.minecraft.structure.pool.StructurePool; import net.minecraft.structure.pool.StructurePool;
import net.minecraft.structure.pool.StructurePoolElement; import net.minecraft.structure.pool.StructurePoolElement;
import net.minecraft.structure.processor.ProcessorLists; import net.minecraft.structure.processor.StructureProcessorLists;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockBox;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -193,7 +193,7 @@ public class FeatureGenerator
new Identifier("bastion/starts"), new Identifier("bastion/starts"),
new Identifier("empty"), new Identifier("empty"),
ImmutableList.of( ImmutableList.of(
Pair.of(StructurePoolElement.method_30435("bastion/units/air_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) Pair.of(StructurePoolElement.method_30435("bastion/units/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1)
), ),
StructurePool.Projection.RIGID StructurePool.Projection.RIGID
), 6), ), 6),
@@ -205,7 +205,7 @@ public class FeatureGenerator
new Identifier("bastion/starts"), new Identifier("bastion/starts"),
new Identifier("empty"), new Identifier("empty"),
ImmutableList.of( ImmutableList.of(
Pair.of(StructurePoolElement.method_30435("bastion/hoglin_stable/air_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) Pair.of(StructurePoolElement.method_30435("bastion/hoglin_stable/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1)
), ),
StructurePool.Projection.RIGID StructurePool.Projection.RIGID
), 6), ), 6),
@@ -217,7 +217,7 @@ public class FeatureGenerator
new Identifier("bastion/starts"), new Identifier("bastion/starts"),
new Identifier("empty"), new Identifier("empty"),
ImmutableList.of( ImmutableList.of(
Pair.of(StructurePoolElement.method_30435("bastion/treasure/big_air_full", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) Pair.of(StructurePoolElement.method_30435("bastion/treasure/big_air_full", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1)
), ),
StructurePool.Projection.RIGID StructurePool.Projection.RIGID
), 6), ), 6),
@@ -229,7 +229,7 @@ public class FeatureGenerator
new Identifier("bastion/starts"), new Identifier("bastion/starts"),
new Identifier("empty"), new Identifier("empty"),
ImmutableList.of( ImmutableList.of(
Pair.of(StructurePoolElement.method_30435("bastion/bridge/starting_pieces/entrance_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) Pair.of(StructurePoolElement.method_30435("bastion/bridge/starting_pieces/entrance_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1)
), ),
StructurePool.Projection.RIGID StructurePool.Projection.RIGID
), 6), ), 6),
src/main/java/carpet/mixins/ServerWorld_tickMixin.java
+5 -4
View File
@@ -25,14 +25,15 @@ import java.util.function.Supplier;
@Mixin(ServerWorld.class) @Mixin(ServerWorld.class)
public abstract class ServerWorld_tickMixin extends World public abstract class ServerWorld_tickMixin extends World
{ {
protected ServerWorld_tickMixin(MutableWorldProperties properties, RegistryKey<World> registryKey, DimensionType dimensionType, Supplier<Profiler> supplier, boolean bl, boolean bl2, long l)
{
super(properties, registryKey, dimensionType, supplier, bl, bl2, l);
}
@Shadow protected abstract void processSyncedBlockEvents(); @Shadow protected abstract void processSyncedBlockEvents();
//@Shadow protected abstract void sendBlockActions(); //@Shadow protected abstract void sendBlockActions();
@Shadow protected abstract void tickTime(); @Shadow protected abstract void tickTime();
protected ServerWorld_tickMixin(MutableWorldProperties mutableWorldProperties, RegistryKey<World> registryKey, RegistryKey<DimensionType> registryKey2, DimensionType dimensionType, Supplier<Profiler> supplier, boolean bl, boolean bl2, long l)
{
super(mutableWorldProperties, registryKey, registryKey2, dimensionType, supplier, bl, bl2, l);
}
private CarpetProfiler.ProfilerToken currentSection; private CarpetProfiler.ProfilerToken currentSection;