Skip to content

Commit fe1b557

Browse files
committed
Liquid textures have been added (Crude Oil, Heavy Oil, Diesel, Gas). Food has been reworked so it can now be cut with Shears. All console warnings I could get to have been fixed.
1 parent 0b455d0 commit fe1b557

123 files changed

Lines changed: 275 additions & 300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/net/infugogr/barracuda/Barracuda.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
import net.fabricmc.loader.api.FabricLoader;
88
import net.infugogr.barracuda.block.ModBlocks;
99
import net.infugogr.barracuda.block.entity.*;
10-
import net.infugogr.barracuda.block.recipes.CentrifugeRecipeManager;
11-
import net.infugogr.barracuda.block.recipes.ChemicalPlantRecipeManager;
10+
import net.infugogr.barracuda.recipes.CentrifugeRecipeManager;
11+
import net.infugogr.barracuda.recipes.ChemicalPlantRecipeManager;
12+
import net.infugogr.barracuda.recipes.ModRecipeSerializer;
1213
import net.infugogr.barracuda.entity.ModEntities;
1314
import net.infugogr.barracuda.entity.custom.AzureSerpentEntity;
1415
import net.infugogr.barracuda.entity.custom.BarracudaEntity;
@@ -54,6 +55,7 @@ public void onInitialize() {
5455
FluidRegisters.register();
5556
CentrifugeRecipeManager.register();
5657
ChemicalPlantRecipeManager.register();
58+
ModRecipeSerializer.registerModRecipes();
5759

5860

5961
// Item Lookup

src/main/java/net/infugogr/barracuda/block/entity/CentrifugeBlockEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
44
import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage;
55
import net.infugogr.barracuda.Barracuda;
6-
import net.infugogr.barracuda.block.recipes.CentrifugeRecipe;
7-
import net.infugogr.barracuda.block.recipes.CentrifugeRecipeManager;
6+
import net.infugogr.barracuda.recipes.CentrifugeRecipe;
7+
import net.infugogr.barracuda.recipes.CentrifugeRecipeManager;
88
import net.infugogr.barracuda.screenhandler.CentrifugeScreenHandler;
99
import net.infugogr.barracuda.util.SyncableStorage;
1010
import net.infugogr.barracuda.util.SyncableTickableBlockEntity;

src/main/java/net/infugogr/barracuda/block/entity/ChemicalPlantBlockEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
99
import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
1010
import net.infugogr.barracuda.Barracuda;
11-
import net.infugogr.barracuda.block.recipes.ChemicalPlantRecipe;
12-
import net.infugogr.barracuda.block.recipes.ChemicalPlantRecipeManager;
11+
import net.infugogr.barracuda.recipes.ChemicalPlantRecipe;
12+
import net.infugogr.barracuda.recipes.ChemicalPlantRecipeManager;
1313
import net.infugogr.barracuda.item.CapsuleItem;
1414
import net.infugogr.barracuda.mixin.BucketItemMixin;
1515
import net.infugogr.barracuda.screenhandler.ChemicalPlantScreenHandler;

src/main/java/net/infugogr/barracuda/block/entity/CircuitImprinterBlockEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
44
import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage;
55
import net.infugogr.barracuda.Barracuda;
6-
import net.infugogr.barracuda.block.recipes.CircuitImprinterRecipes;
6+
import net.infugogr.barracuda.recipes.CircuitImprinterRecipes;
77
import net.infugogr.barracuda.screenhandler.CircuitImprinterScreenHandler;
88
import net.infugogr.barracuda.util.SyncableStorage;
99
import net.infugogr.barracuda.util.SyncableTickableBlockEntity;

src/main/java/net/infugogr/barracuda/block/entity/MachineFrameBlockEntity.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package net.infugogr.barracuda.block.entity;
22

3-
import net.infugogr.barracuda.block.ModBlocks;
4-
import net.infugogr.barracuda.block.recipes.MachineFrameRecipes;
3+
import net.infugogr.barracuda.recipes.MachineFrameRecipes;
54
import net.infugogr.barracuda.item.ModItems;
65
import net.infugogr.barracuda.util.ModTags;
76
import net.infugogr.barracuda.util.UpdatableBlockEntity;
87
import net.minecraft.block.*;
98
import net.minecraft.inventory.Inventories;
10-
import net.minecraft.item.Item;
119
import net.minecraft.item.ItemStack;
1210
import net.minecraft.item.Items;
1311
import net.minecraft.nbt.NbtCompound;
@@ -20,8 +18,6 @@
2018
import net.minecraft.util.math.Direction;
2119
import org.jetbrains.annotations.Nullable;
2220

23-
import java.util.Objects;
24-
2521
import static net.infugogr.barracuda.block.MachineFrameBlock.IS_PLATED;
2622
import static net.minecraft.block.Block.dropStack;
2723
import static net.minecraft.block.HorizontalFacingBlock.FACING;

src/main/java/net/infugogr/barracuda/fluid/RenderFluidHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ public static void register() {
1010
new SimpleFluidRenderHandler(Barracuda.id("block/crude_oil_still"), Barracuda.id("block/crude_oil_flow")));
1111

1212
FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.HEAVY_OIL.still(), ModFluids.HEAVY_OIL.flowing(),
13-
new SimpleFluidRenderHandler(Barracuda.id("block/crude_oil_still"), Barracuda.id("block/crude_oil_flow")));
13+
new SimpleFluidRenderHandler(Barracuda.id("block/heavy_oil_still"), Barracuda.id("block/heavy_oil_flow")));
1414

1515
FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.DIESEL.still(), ModFluids.DIESEL.flowing(),
16-
new SimpleFluidRenderHandler(Barracuda.id("block/crude_oil_still"), Barracuda.id("block/crude_oil_flow")));
16+
new SimpleFluidRenderHandler(Barracuda.id("block/diesel_still"), Barracuda.id("block/diesel_flow")));
1717

1818
FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.GAS.still(), ModFluids.GAS.flowing(),
19-
new SimpleFluidRenderHandler(Barracuda.id("block/crude_oil_still"), Barracuda.id("block/crude_oil_flow")));
19+
new SimpleFluidRenderHandler(Barracuda.id("block/gas_still"), Barracuda.id("block/gas_flow")));
2020
}
2121
}

src/main/java/net/infugogr/barracuda/item/ModFoodComponents.java

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
import net.minecraft.item.FoodComponent;
66

77
public class ModFoodComponents {
8-
// Мясо
9-
public static final FoodComponent PORK = new FoodComponent.Builder().hunger(3).saturationModifier(0.3f).build();
10-
public static final FoodComponent PORK_COOKED = new FoodComponent.Builder().hunger(8).saturationModifier(0.8f).build();
11-
public static final FoodComponent CHICKEN_WING = new FoodComponent.Builder().hunger(2).saturationModifier(0.2f).build();
12-
public static final FoodComponent CHICKEN_WING_COOKED = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build();
138

14-
// Рыба (сырая)
9+
public static final FoodComponent RAW_FISH = new FoodComponent.Builder().hunger(2).saturationModifier(0.1f).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 600, 0), 0.8F).build();
10+
public static final FoodComponent COOKED_FISH = new FoodComponent.Builder().hunger(5).saturationModifier(0.3f).build();
11+
12+
// Рыба
1513
public static final FoodComponent FISH_EEL = new FoodComponent.Builder().hunger(2).saturationModifier(0.2f).build();
1614
public static final FoodComponent FISH_BLUEFISH = new FoodComponent.Builder().hunger(2).saturationModifier(0.2f).build();
1715
public static final FoodComponent FISH_BREAM = new FoodComponent.Builder().hunger(2).saturationModifier(0.2f).build();
@@ -35,29 +33,4 @@ public class ModFoodComponents {
3533
public static final FoodComponent FISH_STURGEON = new FoodComponent.Builder().hunger(5).saturationModifier(0.5f).build();
3634
public static final FoodComponent FISH_TUNA = new FoodComponent.Builder().hunger(5).saturationModifier(0.5f).build();
3735
public static final FoodComponent FISH_SQUID = new FoodComponent.Builder().hunger(3).saturationModifier(0.3f).build();
38-
39-
// Рыба (приготовленная)
40-
public static final FoodComponent COOKED_FISH_EEL = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
41-
public static final FoodComponent COOKED_FISH_BLUEFISH = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
42-
public static final FoodComponent COOKED_FISH_BREAM = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
43-
public static final FoodComponent COOKED_FISH_TILAPIA = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
44-
public static final FoodComponent COOKED_FISH_FLOUNDER = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
45-
public static final FoodComponent COOKED_FISH_GLASS_CATFISH = new FoodComponent.Builder().hunger(6).saturationModifier(0.7f).build();
46-
public static final FoodComponent COOKED_FISH_DOLPHINFISH = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
47-
public static final FoodComponent COOKED_FISH_PIKE = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
48-
public static final FoodComponent COOKED_FISH_HERRING = new FoodComponent.Builder().hunger(5).saturationModifier(0.6f).build();
49-
public static final FoodComponent COOKED_FISH_CARP = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
50-
public static final FoodComponent COOKED_FISH_CATFISH = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
51-
public static final FoodComponent COOKED_FISH_SHORT_COD = new FoodComponent.Builder().hunger(5).saturationModifier(0.6f).build();
52-
public static final FoodComponent COOKED_FISH_SALMON = new FoodComponent.Builder().hunger(9).saturationModifier(0.9f).build();
53-
public static final FoodComponent COOKED_FISH_OCTOPUS = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
54-
public static final FoodComponent COOKED_FISH_SANDFISH = new FoodComponent.Builder().hunger(5).saturationModifier(0.6f).build();
55-
public static final FoodComponent COOKED_FISH_ANCHOVY = new FoodComponent.Builder().hunger(3).saturationModifier(0.4f).build();
56-
public static final FoodComponent COOKED_FISH_SARDINE = new FoodComponent.Builder().hunger(3).saturationModifier(0.4f).build();
57-
public static final FoodComponent COOKED_FISH_BLACK_SEA_BASS = new FoodComponent.Builder().hunger(8).saturationModifier(0.9f).build();
58-
public static final FoodComponent COOKED_FISH_SEA_CUCUMBER = new FoodComponent.Builder().hunger(3).saturationModifier(0.4f).build();
59-
public static final FoodComponent COOKED_FISH_ROCKFISH = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
60-
public static final FoodComponent COOKED_FISH_STURGEON = new FoodComponent.Builder().hunger(10).saturationModifier(1.0f).build();
61-
public static final FoodComponent COOKED_FISH_TUNA = new FoodComponent.Builder().hunger(10).saturationModifier(1.0f).build();
62-
public static final FoodComponent COOKED_FISH_SQUID = new FoodComponent.Builder().hunger(7).saturationModifier(0.8f).build();
6336
}

src/main/java/net/infugogr/barracuda/item/ModItemGroups.java

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,8 @@ public class ModItemGroups {
216216
FabricItemGroup.builder().icon(() -> new ItemStack(ModItems.CHICKEN_WING_COOKED))
217217
.displayName(TITLE6)
218218
.entries((displayContext, entries) -> {
219-
entries.add(ModItems.PORK);
220-
entries.add(ModItems.PORK_COOKED);
221-
entries.add(ModItems.CHICKEN_WING);
222-
entries.add(ModItems.CHICKEN_WING_COOKED);
219+
entries.add(ModItems.RAW_FISH);
220+
entries.add(ModItems.COOKED_FISH);
223221
entries.add(ModItems.FISH_EEL);
224222
entries.add(ModItems.FISH_BLUEFISH);
225223
entries.add(ModItems.FISH_BREAM);
@@ -243,29 +241,6 @@ public class ModItemGroups {
243241
entries.add(ModItems.FISH_STURGEON);
244242
entries.add(ModItems.FISH_TUNA);
245243
entries.add(ModItems.FISH_SQUID);
246-
entries.add(ModItems.COOKED_FISH_EEL);
247-
entries.add(ModItems.COOKED_FISH_BLUEFISH);
248-
entries.add(ModItems.COOKED_FISH_BREAM);
249-
entries.add(ModItems.COOKED_FISH_TILAPIA);
250-
entries.add(ModItems.COOKED_FISH_FLOUNDER);
251-
entries.add(ModItems.COOKED_FISH_GLASS_CATFISH);
252-
entries.add(ModItems.COOKED_FISH_DOLPHINFISH);
253-
entries.add(ModItems.COOKED_FISH_PIKE);
254-
entries.add(ModItems.COOKED_FISH_HERRING);
255-
entries.add(ModItems.COOKED_FISH_CARP);
256-
entries.add(ModItems.COOKED_FISH_CATFISH);
257-
entries.add(ModItems.COOKED_FISH_SHORT_COD);
258-
entries.add(ModItems.COOKED_FISH_SALMON);
259-
entries.add(ModItems.COOKED_FISH_OCTOPUS);
260-
entries.add(ModItems.COOKED_FISH_SANDFISH);
261-
entries.add(ModItems.COOKED_FISH_ANCHOVY);
262-
entries.add(ModItems.COOKED_FISH_SARDINE);
263-
entries.add(ModItems.COOKED_FISH_BLACK_SEA_BASS);
264-
entries.add(ModItems.COOKED_FISH_SEA_CUCUMBER);
265-
entries.add(ModItems.COOKED_FISH_ROCKFISH);
266-
entries.add(ModItems.COOKED_FISH_STURGEON);
267-
entries.add(ModItems.COOKED_FISH_TUNA);
268-
entries.add(ModItems.COOKED_FISH_SQUID);
269244
}).build());
270245

271246
public static void registerItemGroups() {

src/main/java/net/infugogr/barracuda/item/ModItems.java

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,9 @@ public class ModItems {
233233

234234
// food items
235235

236-
public static final Item PORK = registerItem("pork", new Item(new FabricItemSettings().food(ModFoodComponents.PORK)));
237-
public static final Item PORK_COOKED = registerItem("pork_cooked", new Item(new FabricItemSettings().food(ModFoodComponents.PORK_COOKED)));
238-
public static final Item CHICKEN_WING = registerItem("chicken_wing", new Item(new FabricItemSettings().food(ModFoodComponents.CHICKEN_WING)));
239-
public static final Item CHICKEN_WING_COOKED = registerItem("chicken_wing_cooked", new Item(new FabricItemSettings().food(ModFoodComponents.CHICKEN_WING_COOKED)));
236+
public static final Item CHICKEN_WING_COOKED = register("chicken_wing_cooked");
237+
public static final Item RAW_FISH = registerItem("raw_fish", new Item(new FabricItemSettings().food(ModFoodComponents.RAW_FISH)));
238+
public static final Item COOKED_FISH = registerItem("cooked_fish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH)));
240239
public static final Item FISH_EEL = registerItem("fish_eel", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_EEL)));
241240
public static final Item FISH_BLUEFISH = registerItem("fish_bluefish", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_BLUEFISH)));
242241
public static final Item FISH_BREAM = registerItem("fish_bream", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_BREAM)));
@@ -260,29 +259,7 @@ public class ModItems {
260259
public static final Item FISH_STURGEON = registerItem("fish_sturgeon", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_STURGEON)));
261260
public static final Item FISH_TUNA = registerItem("fish_tuna", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_TUNA)));
262261
public static final Item FISH_SQUID = registerItem("fish_squid", new Item(new FabricItemSettings().food(ModFoodComponents.FISH_SQUID)));
263-
public static final Item COOKED_FISH_EEL = registerItem("cooked_fish_eel", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_EEL)));
264-
public static final Item COOKED_FISH_BLUEFISH = registerItem("cooked_fish_bluefish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_BLUEFISH)));
265-
public static final Item COOKED_FISH_BREAM = registerItem("cooked_fish_bream", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_BREAM)));
266-
public static final Item COOKED_FISH_TILAPIA = registerItem("cooked_fish_tilapia", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_TILAPIA)));
267-
public static final Item COOKED_FISH_FLOUNDER = registerItem("cooked_fish_flounder", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_FLOUNDER)));
268-
public static final Item COOKED_FISH_GLASS_CATFISH = registerItem("cooked_fish_glass_catfish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_GLASS_CATFISH)));
269-
public static final Item COOKED_FISH_DOLPHINFISH = registerItem("cooked_fish_dolphinfish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_DOLPHINFISH)));
270-
public static final Item COOKED_FISH_PIKE = registerItem("cooked_fish_pike", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_PIKE)));
271-
public static final Item COOKED_FISH_HERRING = registerItem("cooked_fish_herring", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_HERRING)));
272-
public static final Item COOKED_FISH_CARP = registerItem("cooked_fish_carp", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_CARP)));
273-
public static final Item COOKED_FISH_CATFISH = registerItem("cooked_fish_catfish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_CATFISH)));
274-
public static final Item COOKED_FISH_SHORT_COD = registerItem("cooked_fish_short_cod", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SHORT_COD)));
275-
public static final Item COOKED_FISH_SALMON = registerItem("cooked_fish_salmon", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SALMON)));
276-
public static final Item COOKED_FISH_OCTOPUS = registerItem("cooked_fish_octopus", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_OCTOPUS)));
277-
public static final Item COOKED_FISH_SANDFISH = registerItem("cooked_fish_sandfish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SANDFISH)));
278-
public static final Item COOKED_FISH_ANCHOVY = registerItem("cooked_fish_anchovy", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_ANCHOVY)));
279-
public static final Item COOKED_FISH_SARDINE = registerItem("cooked_fish_sardine", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SARDINE)));
280-
public static final Item COOKED_FISH_BLACK_SEA_BASS = registerItem("cooked_fish_black_sea_bass", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_BLACK_SEA_BASS)));
281-
public static final Item COOKED_FISH_SEA_CUCUMBER = registerItem("cooked_fish_sea_cucumber", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SEA_CUCUMBER)));
282-
public static final Item COOKED_FISH_ROCKFISH = registerItem("cooked_fish_rockfish", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_ROCKFISH)));
283-
public static final Item COOKED_FISH_STURGEON = registerItem("cooked_fish_sturgeon", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_STURGEON)));
284-
public static final Item COOKED_FISH_TUNA = registerItem("cooked_fish_tuna", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_TUNA)));
285-
public static final Item COOKED_FISH_SQUID = registerItem("cooked_fish_squid", new Item(new FabricItemSettings().food(ModFoodComponents.COOKED_FISH_SQUID)));
262+
286263
/**
287264
// Fishing Rod Components
288265
public static final Item MODULAR_FISHING_ROD_ITEM = register(new ModularFishingRodItem(new Item.Settings().maxCount(1)), "modular_fishing_rod");
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package net.infugogr.barracuda.mixin;
2+
3+
import net.minecraft.item.ItemStack;
4+
import net.minecraft.item.ShearsItem;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
10+
11+
@Mixin(ShearsItem.class)
12+
public abstract class ShearsItemMixin {
13+
14+
/**
15+
* Этот метод добавляет в класс ShearsItem метод getRecipeRemainder.
16+
* Он возвращает тот же предмет, но с повреждением на 1 больше (прочность уменьшается на 1).
17+
*/
18+
@Inject(method = "<init>", at = @At("RETURN"))
19+
private void init(CallbackInfo ci) {
20+
// Этот блок инициализации нужен, чтобы убедиться, что миксин подмешивается.
21+
}
22+
23+
// Здесь реализуем наш метод
24+
public ItemStack getRecipeRemainder(ItemStack stack) {
25+
// Создаем копию предмета
26+
ItemStack result = stack.copy();
27+
int damage = result.getDamage();
28+
int maxDamage = result.getMaxDamage();
29+
30+
// Уменьшаем прочность на 1 (ожидается увеличение повреждения)
31+
if (damage < maxDamage) {
32+
result.setDamage(damage + 1);
33+
}
34+
return result;
35+
}
36+
}

0 commit comments

Comments
 (0)