Skip to content

Commit 645a6f3

Browse files
committed
Push JSON files and add missing @OverRide annotation
Update JSON file when rebasing
1 parent dd9f3e7 commit 645a6f3

File tree

5 files changed

+10
-29
lines changed

5 files changed

+10
-29
lines changed

src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntitySqueezer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected void update(Level level, BlockPos pos, BlockState blockState, BlockEnt
164164
ItemStack oldItem = blockEntity.getInventory().getItem(0);
165165
blockEntity.getInventory().setItem(0, ItemStack.EMPTY);
166166
for (RecipeSqueezer.IngredientChance itemStackChance : recipe.assemble(oldItem)) {
167-
if (itemStackChance.getChance() == 1.0F || itemStackChance.getChance() >= level.random.nextFloat()) {
167+
if (itemStackChance.getChance() == 1.0F || itemStackChance.getChance() >= level.random.nextFloat()) {
168168
ItemStack resultStack = itemStackChance.getIngredientFirst().copy();
169169
for (Direction side : Direction.values()) {
170170
if (!resultStack.isEmpty() && side != Direction.UP) {

src/main/java/org/cyclops/integrateddynamics/core/recipe/type/RecipeFacadeSqueeze.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ public class RecipeFacadeSqueeze extends RecipeSqueezer {
2222
public RecipeFacadeSqueeze(ResourceLocation id, Ingredient inputIngredient, NonNullList<IngredientChance> outputItems, FluidStack outputFluid) {
2323
super(id, inputIngredient, outputItems, outputFluid);
2424
}
25-
25+
26+
@Override
2627
public NonNullList<IngredientChance> assemble(ItemStack inputItem) {
27-
return getOutput(inputItem);
28+
return getOutput(inputItem);
2829
}
2930

3031
public static NonNullList<IngredientChance> getOutput(ItemStack inputItem) {

src/main/java/org/cyclops/integrateddynamics/core/recipe/type/RecipeFacadeSqueezeMechanical.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
import net.minecraftforge.fluids.FluidStack;
1111

1212
public class RecipeFacadeSqueezeMechanical extends RecipeMechanicalSqueezer {
13-
13+
1414
public RecipeFacadeSqueezeMechanical(ResourceLocation id, Ingredient inputIngredient, NonNullList<IngredientChance> outputItems, FluidStack outputFluid, int duration) {
1515
super(id, inputIngredient, outputItems, outputFluid, duration);
1616
}
1717

18+
@Override
1819
public NonNullList<IngredientChance> assemble(ItemStack inputItem) {
19-
return RecipeFacadeSqueeze.getOutput(inputItem);
20+
return RecipeFacadeSqueeze.getOutput(inputItem);
2021
}
2122

2223
@Override

src/main/java/org/cyclops/integrateddynamics/core/recipe/type/RecipeSerializerMechanicalSqueezerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/**
77
* Config for the mechanical squeezer recipe serializer.
8-
* @author rubensworks
8+
* @author kirjorjos
99
*
1010
*/
1111
public class RecipeSerializerMechanicalSqueezerConfig extends RecipeConfig<RecipeMechanicalSqueezer> {
Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
11
{
2-
"type": "integrateddynamics:facade_squeeze_mechanical",
3-
"item": {
4-
"item": "integrateddynamics:facade"
5-
},
6-
"result": {
7-
"items": [
8-
{
9-
"item": {
10-
"item": "integrateddynamics:facade",
11-
"chance": 1,
12-
"count": 1
13-
}
14-
},
15-
{
16-
"item": {
17-
"item": "integrateddynamics:facade",
18-
"chance": 1,
19-
"count": 1
20-
}
21-
}
22-
]
23-
},
24-
"duration": 20
2+
"type": "integrateddynamics:facade_squeeze_mechanical",
3+
"duration": 20
254
}

0 commit comments

Comments
 (0)