Skip to content

Commit cb8aaca

Browse files
AltnoirAltnoir
committed
Merge remote-tracking branch 'upstream/1.21.1-NeoForge' into 1.21.1-NeoForge
2 parents 452f04a + d41e6e1 commit cb8aaca

14 files changed

Lines changed: 160 additions & 211 deletions

‎src/main/java/com/altnoir/poopsky/PoopSkyClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public static void registerItemColors(RegisterColorHandlersEvent.Item event) {
153153
event.register((stack, tintIndex) -> tintIndex == 1 ? 0x3F76E4 : -1, PoBlocks.WATER_COMPOOPER.get());
154154
}
155155

156-
public static void registerBlockRenderBuffers(net.neoforged.neoforge.client.event.RegisterRenderBuffersEvent event) {
156+
public static void registerBlockRenderBuffers(RegisterRenderBuffersEvent event) {
157157
event.registerRenderBuffer(RenderType.translucent());
158158
}
159159

‎src/main/java/com/altnoir/poopsky/client/model/ToiletBakedModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.altnoir.poopsky.content.block.entity.ToiletBlockEntity;
66
import com.altnoir.poopsky.content.block.p.BaseToiletLavaBlock;
77
import net.minecraft.client.Minecraft;
8+
import net.minecraft.client.renderer.RenderType;
89
import net.minecraft.client.renderer.block.model.BakedQuad;
910
import net.minecraft.client.renderer.block.model.ItemOverrides;
1011
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -243,7 +244,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
243244
}
244245

245246
@Override
246-
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction face, RandomSource random, ModelData modelData, @Nullable net.minecraft.client.renderer.RenderType renderType) {
247+
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction face, RandomSource random, ModelData modelData, @Nullable RenderType renderType) {
247248
BakedModel selected = selectModel(state, modelData);
248249
int yRot = getYRotation(state);
249250
Direction sourceFace = face == null ? null : unrotateDirection(face, yRot);

‎src/main/java/com/altnoir/poopsky/compat/create/PSRecipeTypes.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
import net.minecraft.world.item.crafting.RecipeInput;
1111
import net.minecraft.world.item.crafting.RecipeSerializer;
1212
import net.minecraft.world.item.crafting.RecipeType;
13-
import net.minecraft.world.level.Level;
1413
import net.neoforged.bus.api.IEventBus;
1514
import net.neoforged.neoforge.registries.DeferredHolder;
1615
import net.neoforged.neoforge.registries.DeferredRegister;
1716

18-
import java.util.Optional;
19-
2017
@SuppressWarnings("unchecked")
2118
public enum PSRecipeTypes implements IRecipeTypeInfo {
2219
DIGESTING(DigestingRecipe::new);
@@ -52,10 +49,6 @@ public <I extends RecipeInput, R extends Recipe<I>> RecipeType<R> getType() {
5249
return (RecipeType<R>) typeObject.get();
5350
}
5451

55-
public <I extends RecipeInput, R extends Recipe<I>> Optional<net.minecraft.world.item.crafting.RecipeHolder<R>> find(I inv, Level world) {
56-
return world.getRecipeManager().getRecipeFor(getType(), inv, world);
57-
}
58-
5952
private static class Registers {
6053
private static final DeferredRegister<RecipeSerializer<?>> SERIALIZER_REGISTER =
6154
DeferredRegister.create(BuiltInRegistries.RECIPE_SERIALIZER, PoopSky.MOD_ID);

‎src/main/java/com/altnoir/poopsky/content/block/p/PoopEmptyLogBlock.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.google.common.base.Suppliers;
55
import com.google.common.collect.ImmutableMap;
66
import net.minecraft.core.BlockPos;
7+
import net.minecraft.sounds.SoundEvents;
78
import net.minecraft.sounds.SoundSource;
89
import net.minecraft.world.InteractionHand;
910
import net.minecraft.world.ItemInteractionResult;
@@ -49,7 +50,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
4950
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
5051
if (stack.is(Items.SHEARS) && !state.getValue(ARROW)) {
5152
level.setBlockAndUpdate(pos, state.setValue(ARROW, true));
52-
level.playSound(null, pos, net.minecraft.sounds.SoundEvents.SHEEP_SHEAR, SoundSource.BLOCKS, 1.0F, 1.0F);
53+
level.playSound(null, pos, SoundEvents.SHEEP_SHEAR, SoundSource.BLOCKS, 1.0F, 1.0F);
5354
stack.hurtAndBreak(1, player, EquipmentSlot.MAINHAND);
5455
return ItemInteractionResult.sidedSuccess(level.isClientSide);
5556
}

‎src/main/java/com/altnoir/poopsky/content/item/p/ToiletLinkerItem.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.network.chat.Component;
1313
import net.minecraft.resources.ResourceKey;
1414
import net.minecraft.resources.ResourceLocation;
15+
import net.minecraft.server.MinecraftServer;
1516
import net.minecraft.server.level.ServerLevel;
1617
import net.minecraft.server.level.TicketType;
1718
import net.minecraft.sounds.SoundSource;
@@ -138,7 +139,7 @@ private static void setToiletLink(Object be, BlockPos targetPos, ServerLevel tar
138139
}
139140
}
140141

141-
private Optional<ServerLevel> getLevelFromKey(net.minecraft.server.MinecraftServer server, String dimStr) {
142+
private Optional<ServerLevel> getLevelFromKey(MinecraftServer server, String dimStr) {
142143
if (dimStr.isEmpty()) return Optional.empty();
143144
ResourceLocation loc = ResourceLocation.tryParse(dimStr);
144145
if (loc == null) return Optional.empty();

‎src/main/java/com/altnoir/poopsky/content/recipe/AnalPressingRecipe.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.core.HolderLookup;
99
import net.minecraft.core.NonNullList;
1010
import net.minecraft.core.registries.BuiltInRegistries;
11+
import net.minecraft.core.registries.Registries;
1112
import net.minecraft.network.RegistryFriendlyByteBuf;
1213
import net.minecraft.network.codec.ByteBufCodecs;
1314
import net.minecraft.network.codec.StreamCodec;
@@ -80,8 +81,8 @@ public static class Serializer implements RecipeSerializer<AnalPressingRecipe> {
8081
public static final StreamCodec<RegistryFriendlyByteBuf, AnalPressingRecipe> STREAM_CODEC =
8182
StreamCodec.composite(
8283
Ingredient.CONTENTS_STREAM_CODEC, AnalPressingRecipe::input,
83-
ByteBufCodecs.registry(net.minecraft.core.registries.Registries.BLOCK), AnalPressingRecipe::output,
84-
ByteBufCodecs.registry(net.minecraft.core.registries.Registries.BLOCK), AnalPressingRecipe::replaceTarget,
84+
ByteBufCodecs.registry(Registries.BLOCK), AnalPressingRecipe::output,
85+
ByteBufCodecs.registry(Registries.BLOCK), AnalPressingRecipe::replaceTarget,
8586
ByteBufCodecs.VAR_INT, AnalPressingRecipe::radius,
8687
AnalPressingRecipe::new);
8788

‎src/main/java/com/altnoir/poopsky/content/recipe/BreedingChestRecipe.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.altnoir.poopsky.content.recipe;
22

33
import com.altnoir.poopsky.init.PoRecipes;
4+
import com.mojang.serialization.Codec;
45
import com.mojang.serialization.MapCodec;
56
import com.mojang.serialization.codecs.RecordCodecBuilder;
67
import net.minecraft.core.HolderLookup;
78
import net.minecraft.network.RegistryFriendlyByteBuf;
89
import net.minecraft.network.codec.ByteBufCodecs;
910
import net.minecraft.network.codec.StreamCodec;
11+
import net.minecraft.util.ExtraCodecs;
1012
import net.minecraft.world.item.ItemStack;
1113
import net.minecraft.world.item.crafting.Recipe;
1214
import net.minecraft.world.item.crafting.RecipeInput;
@@ -59,10 +61,10 @@ public RecipeType<?> getType() {
5961

6062
public static class Serializer implements RecipeSerializer<BreedingChestRecipe> {
6163
public static final MapCodec<BreedingChestRecipe> CODEC = RecordCodecBuilder.mapCodec(inst -> inst.group(
62-
net.minecraft.util.ExtraCodecs.NON_EMPTY_STRING.fieldOf("parent1").forGetter(BreedingChestRecipe::parent1),
63-
net.minecraft.util.ExtraCodecs.NON_EMPTY_STRING.fieldOf("parent2").forGetter(BreedingChestRecipe::parent2),
64-
net.minecraft.util.ExtraCodecs.NON_EMPTY_STRING.fieldOf("result").forGetter(BreedingChestRecipe::result),
65-
com.mojang.serialization.Codec.floatRange(0.0F, 1.0F).fieldOf("chance").forGetter(BreedingChestRecipe::chance)
64+
ExtraCodecs.NON_EMPTY_STRING.fieldOf("parent1").forGetter(BreedingChestRecipe::parent1),
65+
ExtraCodecs.NON_EMPTY_STRING.fieldOf("parent2").forGetter(BreedingChestRecipe::parent2),
66+
ExtraCodecs.NON_EMPTY_STRING.fieldOf("result").forGetter(BreedingChestRecipe::result),
67+
Codec.floatRange(0.0F, 1.0F).fieldOf("chance").forGetter(BreedingChestRecipe::chance)
6668
).apply(inst, BreedingChestRecipe::new));
6769

6870
public static final StreamCodec<RegistryFriendlyByteBuf, BreedingChestRecipe> STREAM_CODEC =

‎src/main/java/com/altnoir/poopsky/content/recipe/FlyBarrelRecipeBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import net.minecraft.data.recipes.RecipeOutput;
1313
import net.minecraft.resources.ResourceLocation;
1414
import net.minecraft.world.item.Item;
15-
import net.minecraft.world.item.ItemStack;
16-
import net.minecraft.world.level.ItemLike;
1715
import org.jetbrains.annotations.NotNull;
1816
import org.jetbrains.annotations.Nullable;
1917

@@ -36,15 +34,6 @@ public static FlyBarrelRecipeBuilder flyBarrel(String flyTypeId, ResourceLocatio
3634
return new FlyBarrelRecipeBuilder(flyTypeId, new FlyBarrelRecipe.Output(result, 1));
3735
}
3836

39-
public static FlyBarrelRecipeBuilder flyBarrel(String flyTypeId, ItemStack result) {
40-
return new FlyBarrelRecipeBuilder(flyTypeId,
41-
new FlyBarrelRecipe.Output(BuiltInRegistries.ITEM.getKey(result.getItem()), result.getCount()));
42-
}
43-
44-
public static FlyBarrelRecipeBuilder flyBarrel(String flyTypeId, ItemLike result) {
45-
return flyBarrel(flyTypeId, BuiltInRegistries.ITEM.getKey(result.asItem()));
46-
}
47-
4837
@Override
4938
public @NotNull RecipeBuilder unlockedBy(String name, Criterion<?> criterion) {
5039
this.criteria.put(name, criterion);

‎src/main/java/com/altnoir/poopsky/content/recipe/ToiletRecipeBuilder.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import com.altnoir.poopsky.content.ToiletType;
44
import net.minecraft.advancements.Advancement;
5+
import net.minecraft.advancements.AdvancementHolder;
56
import net.minecraft.advancements.Criterion;
67
import net.minecraft.data.recipes.RecipeBuilder;
78
import net.minecraft.data.recipes.RecipeCategory;
89
import net.minecraft.data.recipes.RecipeOutput;
910
import net.minecraft.data.recipes.ShapedRecipeBuilder;
1011
import net.minecraft.resources.ResourceLocation;
1112
import net.minecraft.world.item.Item;
13+
import net.minecraft.world.item.crafting.Recipe;
1214
import net.minecraft.world.item.crafting.ShapedRecipe;
1315
import net.minecraft.world.level.ItemLike;
1416
import net.neoforged.neoforge.common.conditions.ICondition;
@@ -59,7 +61,7 @@ public ToiletRecipeBuilder define(char symbol, ItemLike item) {
5961
public void save(RecipeOutput recipeOutput, ResourceLocation id) {
6062
delegate.save(new RecipeOutput() {
6163
@Override
62-
public void accept(ResourceLocation recipeId, net.minecraft.world.item.crafting.Recipe<?> recipe, @Nullable net.minecraft.advancements.AdvancementHolder advancement) {
64+
public void accept(ResourceLocation recipeId, Recipe<?> recipe, @Nullable AdvancementHolder advancement) {
6365
if (recipe instanceof ShapedRecipe shaped) {
6466
recipeOutput.accept(recipeId, new ToiletShapedRecipe(shaped, toiletType), advancement);
6567
} else {
@@ -68,7 +70,7 @@ public void accept(ResourceLocation recipeId, net.minecraft.world.item.crafting.
6870
}
6971

7072
@Override
71-
public void accept(ResourceLocation recipeId, net.minecraft.world.item.crafting.Recipe<?> recipe, @Nullable net.minecraft.advancements.AdvancementHolder advancement, ICondition... conditions) {
73+
public void accept(ResourceLocation recipeId, Recipe<?> recipe, @Nullable AdvancementHolder advancement, ICondition... conditions) {
7274
if (recipe instanceof ShapedRecipe shaped) {
7375
recipeOutput.accept(recipeId, new ToiletShapedRecipe(shaped, toiletType), advancement, conditions);
7476
} else {

‎src/main/java/com/altnoir/poopsky/impl/network/PlayAnimationPayload.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.altnoir.poopsky.impl.network;
22

33
import com.altnoir.poopsky.PoopSky;
4+
import com.altnoir.poopsky.client.PoAnimationController;
45
import net.minecraft.network.FriendlyByteBuf;
56
import net.minecraft.network.codec.StreamCodec;
67
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -14,9 +15,7 @@ public record PlayAnimationPayload(PoAnimation animation) implements CustomPacke
1415
);
1516

1617
public static void handle(PlayAnimationPayload payload, IPayloadContext context) {
17-
context.enqueueWork(() ->
18-
com.altnoir.poopsky.client.PoAnimationController.play(payload.animation())
19-
);
18+
context.enqueueWork(() -> PoAnimationController.play(payload.animation()));
2019
}
2120

2221
private static void encode(FriendlyByteBuf buffer, PlayAnimationPayload payload) {

0 commit comments

Comments
 (0)