Skip to content

Commit

Permalink
Update to 1.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
DragonEggBedrockBreaking committed Feb 28, 2022
1 parent fac8b71 commit 885eb12
Show file tree
Hide file tree
Showing 12 changed files with 655 additions and 323 deletions.
14 changes: 7 additions & 7 deletions buildscript/src/main/java/Buildscript.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class Buildscript extends FabricProject {
@Override
public VersionMeta createMcVersion() {
// Minecraft Version
return Minecraft.getVersion("1.18.1");
return Minecraft.getVersion("1.18.2");
}

@Override
Expand All @@ -27,7 +27,7 @@ public MappingTree createMappings() {
@Override
public FabricLoader getLoader() {
// Fabric Loader Version
return new FabricLoader(FabricMaven.URL, FabricMaven.loader("0.13.2"));
return new FabricLoader(FabricMaven.URL, FabricMaven.loader("0.13.3"));
}

@Override
Expand All @@ -45,14 +45,14 @@ public String getVersion() {
@Override
public void getModDependencies(ModDependencyCollector d) {
// Fabric API
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-resource-loader-v0", "0.4.11+3ac43d9514"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-game-rule-api-v1", "1.0.10+3ac43d9514"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-lifecycle-events-v1", "1.4.10+c15ca33565"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-api-base", "0.4.1+b4f4f6cd14"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-resource-loader-v0", "0.4.16+55dca1a4d2"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-game-rule-api-v1", "1.0.12+d7c144a8d2"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-lifecycle-events-v1", "2.0.1+25407454d2"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
d.addMaven(FabricMaven.URL, new MavenId(FabricMaven.GROUP_ID + ".fabric-api", "fabric-api-base", "0.4.3+d7c144a8d2"), ModDependencyFlag.RUNTIME, ModDependencyFlag.COMPILE);
// CaffeineConfig
d.addMaven("https://jitpack.io", new MavenId("com.github.FlashyReese:CaffeineConfig:383ee33be5"), ModDependencyFlag.COMPILE, ModDependencyFlag.JIJ, ModDependencyFlag.RUNTIME);
// DataBreaker
d.addMaven("https://maven.gegy.dev/", new MavenId("supercoder79:databreaker:0.2.8"), ModDependencyFlag.RUNTIME);
//d.addMaven("https://maven.gegy.dev/", new MavenId("supercoder79:databreaker:0.2.8"), ModDependencyFlag.RUNTIME);
// Tiefix
d.addMaven("https://api.modrinth.com/maven/", new MavenId("maven.modrinth:tiefix:1.9.0"), ModDependencyFlag.RUNTIME);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/debb/vanilla_disable/mixin/VanillaDisableMixinConfigPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected CaffeineConfig createConfig() {
.addMixinOption("spawn_limits", true)
.addMixinOption("spawning", true)
.addMixinOption("worldgen", true)
.addMixinOption("worldgen.biomes", true)
.addMixinOption("worldgen.datapacks", true)
.withInfoUrl("https://github.com/DragonEggBedrockBreaking/VanillaDisable/wiki/Mixin-Configuration-File")
.build(FabricLoader.getInstance().getConfigDir().resolve("vanilla-disable-mixin.properties"));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/debb/vanilla_disable/mixin/despawning/MixinNaturalSpawner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private static void mayMeRightDistanceToPlayerAndSpawnPoint(ServerLevel level, C
if (RegisterGamerules.getServer() == null) return;
if (squaredDistance <= Math.pow(RegisterGamerules.getServer().getGameRules().getInt(RegisterGamerules.MIN_SPAWN_DISTANCE), 2)) {
cir.setReturnValue(false);
} else if (level.getSharedSpawnPos().closerThan(new Vec3((double)pos.getX() + 0.5, pos.getY(), (double)pos.getZ() + 0.5), RegisterGamerules.getServer().getGameRules().getInt(RegisterGamerules.MIN_SPAWN_DISTANCE))) {
} else if (level.getSharedSpawnPos().closerToCenterThan(new Vec3((double)pos.getX() + 0.5, pos.getY(), (double)pos.getZ() + 0.5), RegisterGamerules.getServer().getGameRules().getInt(RegisterGamerules.MIN_SPAWN_DISTANCE))) {
cir.setReturnValue(false);
} else {
cir.setReturnValue(Objects.equals(new ChunkPos(pos), chunk.getPos()) || level.isPositionEntityTicking(pos));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/uk/debb/vanilla_disable/mixin/fluids/MixinBucketItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.tags.FluidTags;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.dimension.DimensionType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.BlockHitResult;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
Expand Down Expand Up @@ -45,7 +45,7 @@ public abstract class MixinBucketItem {
)
)
public boolean isNotUltraWarm(DimensionType type, @Nullable Player player, Level level, BlockPos pos, @Nullable BlockHitResult hitResult) {
if (RegisterGamerules.getServer().getGameRules().getBoolean(RegisterGamerules.WATER_PLACEABLE_IN_NETHER) && this.content.is(FluidTags.WATER)) {
if (RegisterGamerules.getServer().getGameRules().getBoolean(RegisterGamerules.WATER_PLACEABLE_IN_NETHER) && (this.content == Fluids.WATER || this.content == Fluids.FLOWING_WATER)) {
return false;
}
return type.ultraWarm();
Expand All @@ -62,7 +62,7 @@ public boolean isNotUltraWarm(DimensionType type, @Nullable Player player, Level
@Inject(method = "playEmptySound", at = @At(value = "HEAD"), cancellable = true)
protected void cancelPlayiningEmptySound(@Nullable Player player, LevelAccessor world, BlockPos pos, CallbackInfo ci) {
if (RegisterGamerules.getServer() == null) return;
if (world.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER) &&
if (world.dimensionType().ultraWarm() && (this.content == Fluids.WATER || this.content == Fluids.FLOWING_WATER) &&
((ServerLevelAccessor)world).getLevel().getGameRules().getBoolean(RegisterGamerules.WATER_PLACEABLE_IN_NETHER)) {
world.playSound(player, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5f, 2.6f + (world.getRandom().nextFloat() - world.getRandom().nextFloat()) * 0.8f);
for (int l = 0; l < 8; ++l) {
Expand Down
71 changes: 0 additions & 71 deletions src/main/java/uk/debb/vanilla_disable/mixin/worldgen/MixinStructureSettings.java
View file

This file was deleted.

Loading

0 comments on commit 885eb12

Please sign in to comment.