Skip to content

Commit 940586f

Browse files
committed
1.19.4
1 parent 2af7d65 commit 940586f

39 files changed

+172
-119
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060

6161
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
6262

63-
modImplementation "vazkii.patchouli:Patchouli:${project.patchouli_version}"
63+
modCompileOnly "vazkii.patchouli:Patchouli:${project.patchouli_version}"
6464

6565
modImplementation annotationProcessor("io.wispforest:owo-lib:${project.owo_version}")
6666
include "io.wispforest:owo-sentinel:${project.owo_version}"

gradle.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
44
# check these on https://fabricmc.net/develop
5-
minecraft_base_version=1.19.3
6-
minecraft_version=1.19.3
7-
yarn_mappings=1.19.3+build.5
8-
loader_version=0.14.13
5+
minecraft_base_version=1.19.4
6+
minecraft_version=1.19.4
7+
yarn_mappings=1.19.4+build.1
8+
loader_version=0.14.18
99
# Mod Properties
10-
mod_version=1.0.26
10+
mod_version=1.0.27
1111
maven_group=com.glisco
1212
archives_base_name=conjuring
1313
# Dependencies
14-
fabric_version=0.76.0+1.19.3
14+
fabric_version=0.76.0+1.19.4
1515

1616
# https://maven.blamejared.com/vazkii/patchouli/Patchouli/
1717
patchouli_version=1.19.3-79-FABRIC-SNAPSHOT
1818

1919
# https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
20-
rei_version=10.0.592
20+
rei_version=11.0.597
2121

2222
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
23-
modmenu_version=5.0.2
23+
modmenu_version=6.1.0-rc.4
2424

2525
# https://maven.wispforest.io/io/wispforest/owo-lib/
26-
owo_version=0.10.3+1.19.3
26+
owo_version=0.10.3+1.19.4

src/main/java/com/glisco/conjuring/Conjuring.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import net.minecraft.predicate.item.ItemPredicate;
4343
import net.minecraft.registry.Registries;
4444
import net.minecraft.registry.Registry;
45+
import net.minecraft.resource.featuretoggle.FeatureFlags;
4546
import net.minecraft.screen.ScreenHandlerType;
4647
import net.minecraft.sound.SoundEvent;
4748
import net.minecraft.util.Identifier;
@@ -56,8 +57,8 @@ public class Conjuring implements ModInitializer {
5657
.builder(Conjuring.id("conjuring"), () -> Icon.of(ConjuringBlocks.CONJURER))
5758
.build();
5859

59-
public static final ScreenHandlerType<ConjurerScreenHandler> CONJURER_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(ConjurerScreenHandler::new);
60-
public static final ScreenHandlerType<SoulfireForgeScreenHandler> SOULFIRE_FORGE_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(SoulfireForgeScreenHandler::new);
60+
public static final ScreenHandlerType<ConjurerScreenHandler> CONJURER_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(ConjurerScreenHandler::new, FeatureFlags.DEFAULT_ENABLED_FEATURES);
61+
public static final ScreenHandlerType<SoulfireForgeScreenHandler> SOULFIRE_FORGE_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(SoulfireForgeScreenHandler::new, FeatureFlags.DEFAULT_ENABLED_FEATURES);
6162

6263
public static final EntityType<SoulProjectileEntity> SOUL_PROJECTILE;
6364
public static final EntityType<SoulDiggerEntity> SOUL_DIGGER;

src/main/java/com/glisco/conjuring/blocks/BlackstonePedestalBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.block.entity.BlockEntity;
77
import net.minecraft.item.ItemStack;
88
import net.minecraft.nbt.NbtCompound;
9-
import net.minecraft.network.Packet;
109
import net.minecraft.network.listener.ClientPlayPacketListener;
10+
import net.minecraft.network.packet.Packet;
1111
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
1212
import net.minecraft.util.math.BlockPos;
1313
import org.jetbrains.annotations.NotNull;

src/main/java/com/glisco/conjuring/blocks/SoulFunnelBlockEntity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import net.minecraft.loot.LootGsons;
3434
import net.minecraft.loot.LootTable;
3535
import net.minecraft.nbt.NbtCompound;
36-
import net.minecraft.network.Packet;
3736
import net.minecraft.network.listener.ClientPlayPacketListener;
37+
import net.minecraft.network.packet.Packet;
3838
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
3939
import net.minecraft.particle.BlockStateParticleEffect;
4040
import net.minecraft.particle.ParticleEffect;
@@ -163,7 +163,7 @@ public void tickServer() {
163163
if (world.getOtherEntities(null, new Box(pos)).isEmpty()) return;
164164

165165
Entity e = world.getOtherEntities(null, new Box(pos)).get(0);
166-
if (e instanceof PlayerEntity || e instanceof EnderDragonEntity || e instanceof WitherEntity || !(e instanceof LivingEntity) || e.getScoreboardTags().contains("affected"))
166+
if (e instanceof PlayerEntity || e instanceof EnderDragonEntity || e instanceof WitherEntity || !(e instanceof LivingEntity) || e.getCommandTags().contains("affected"))
167167
return;
168168

169169
((LivingEntity) e).addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 15 * 20, 20));
@@ -272,7 +272,7 @@ public boolean removePedestal(BlockPos pedestal, boolean pedestalActive) {
272272
boolean returnValue = pedestalPositions.remove(pedestal);
273273
this.markDirty();
274274

275-
BlockPos offset = new BlockPos(Vec3d.of(pedestal.subtract(pos)).normalize());
275+
BlockPos offset = BlockPos.ofFloored(Vec3d.of(pedestal.subtract(pos)).normalize());
276276
ConjuringParticleEvents.PEDESTAL_REMOVED.spawn(world, Vec3d.of(pos), Direction.fromVector(offset));
277277

278278
if (pedestalActive) {
@@ -414,7 +414,7 @@ public Packet<ClientPlayPacketListener> toUpdatePacket() {
414414

415415
PROCESS.addServerStep(20, 60, (executor, funnel) -> {
416416
if (executor.getProcessTick() % 10 != 0) return;
417-
((ServerWorld) funnel.world).getEntity(funnel.ritualEntity).damage(DamageSource.OUT_OF_WORLD, 0.01f);
417+
((ServerWorld) funnel.world).getEntity(funnel.ritualEntity).damage(funnel.world.getDamageSources().outOfWorld(), 0.01f);
418418
});
419419

420420
PROCESS.whenFinishedServer((executor, funnel) -> {

src/main/java/com/glisco/conjuring/blocks/conjurer/ConjurerBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.minecraft.inventory.SidedInventory;
1212
import net.minecraft.item.ItemStack;
1313
import net.minecraft.nbt.NbtCompound;
14-
import net.minecraft.network.Packet;
1514
import net.minecraft.network.listener.ClientPlayPacketListener;
15+
import net.minecraft.network.packet.Packet;
1616
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
1717
import net.minecraft.screen.NamedScreenHandlerFactory;
1818
import net.minecraft.screen.ScreenHandler;

src/main/java/com/glisco/conjuring/blocks/conjurer/ConjurerLogic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void serverTick(ServerWorld world, BlockPos pos) {
104104
double e = j >= 2 ? nbtList.getDouble(1) : (double) (pos.getY() + random.nextInt(3) - 1);
105105
double f = j >= 3 ? nbtList.getDouble(2) : (double) pos.getZ() + (random.nextDouble() - random.nextDouble()) * (double) this.spawnRange + 0.5;
106106
if (world.isSpaceEmpty((optional.get()).createSimpleBoundingBox(d, e, f))) {
107-
BlockPos blockPos = new BlockPos(d, e, f);
107+
BlockPos blockPos = BlockPos.ofFloored(d, e, f);
108108
if (this.spawnEntry.getCustomSpawnRules().isPresent()) {
109109
if (!(optional.get()).getSpawnGroup().isPeaceful() && world.getDifficulty() == Difficulty.PEACEFUL) {
110110
continue;

src/main/java/com/glisco/conjuring/blocks/gem_tinkerer/GemTinkererBlockEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import net.minecraft.inventory.SimpleInventory;
1717
import net.minecraft.item.ItemStack;
1818
import net.minecraft.nbt.NbtCompound;
19-
import net.minecraft.network.Packet;
2019
import net.minecraft.network.listener.ClientPlayPacketListener;
20+
import net.minecraft.network.packet.Packet;
2121
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
2222
import net.minecraft.server.network.ServerPlayerEntity;
2323
import net.minecraft.sound.SoundCategory;
@@ -185,7 +185,7 @@ public boolean isCraftingComplete() {
185185
}
186186
} else {
187187
inventory.clear();
188-
inventory.set(0, tinkerer.cachedRecipe.getOutput());
188+
inventory.set(0, tinkerer.cachedRecipe.getOutput(null));
189189
}
190190

191191
tinkerer.cachedRecipe = null;

src/main/java/com/glisco/conjuring/blocks/gem_tinkerer/GemTinkererRecipe.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import net.minecraft.recipe.Recipe;
1111
import net.minecraft.recipe.RecipeSerializer;
1212
import net.minecraft.recipe.RecipeType;
13+
import net.minecraft.registry.DynamicRegistryManager;
1314
import net.minecraft.util.Identifier;
1415
import net.minecraft.util.collection.DefaultedList;
1516
import net.minecraft.world.World;
@@ -55,7 +56,7 @@ public boolean matches(Inventory inventory, World world) {
5556
}
5657

5758
@Override
58-
public ItemStack craft(Inventory inventory) {
59+
public ItemStack craft(Inventory inventory, DynamicRegistryManager drm) {
5960
return ItemStack.EMPTY;
6061
}
6162

@@ -65,7 +66,7 @@ public boolean fits(int var1, int var2) {
6566
}
6667

6768
@Override
68-
public ItemStack getOutput() {
69+
public ItemStack getOutput(DynamicRegistryManager drm) {
6970
return result.copy();
7071
}
7172

src/main/java/com/glisco/conjuring/blocks/gem_tinkerer/GemTinkererRecipeSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public GemTinkererRecipe read(Identifier id, PacketByteBuf buf) {
6060

6161
@Override
6262
public void write(PacketByteBuf buf, GemTinkererRecipe recipe) {
63-
buf.writeItemStack(recipe.getOutput());
63+
buf.writeItemStack(recipe.getOutput(null));
6464

6565
for (Ingredient ingredient : recipe.getInputs()) {
6666
ingredient.write(buf);

0 commit comments

Comments
 (0)