Skip to content

Commit 17535f9

Browse files
committed
-Added the water filter support (closes #6)
-Updated the Gradle wrapper -Version bump -Updated all the dependencies -Added a few lines to the Russian .lang file
1 parent 33b2d85 commit 17535f9

File tree

9 files changed

+41
-10
lines changed

9 files changed

+41
-10
lines changed

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
org.gradle.jvmargs=-Xmx3G
44
fg_version=2.3-SNAPSHOT
55
mc_version=1.12.2
6-
forge_version=14.23.3.2678
6+
forge_version=14.23.4.2727
77
jei_mcversion=1.12.2
8-
jei_version=4.9.1.175
9-
mod_dependencies=required-after:harvestcraft@[1.12.2t,);required-after:jei@[4.9,);
10-
mappings_version=snapshot_20180501
8+
jei_version=4.11.0.204
9+
mod_dependencies=required-after:harvestcraft@[1.12.2u,);required-after:jei@[4.11,);
10+
mappings_version=snapshot_20180704
1111
accepted_mc_versions=[1.12]
12-
mod_version=1.5.1
12+
mod_version=1.6.0
1313
build_number=0

gradle/wrapper/gradle-wrapper.jar

-299 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jul 17 20:19:13 YEKT 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip

src/main/java/ru/pearx/jehc/jei/JEHCPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import ru.pearx.jehc.jei.apiary.ApiaryRecipeCategory;
1111
import ru.pearx.jehc.jei.machine.GrinderRecipeCategory;
1212
import ru.pearx.jehc.jei.machine.PresserRecipeCategory;
13+
import ru.pearx.jehc.jei.machine.WaterFilterCategory;
1314
import ru.pearx.jehc.jei.sbm.MarketRecipeCategory;
1415
import ru.pearx.jehc.jei.sbm.ShippingBinRecipeCategory;
1516
import ru.pearx.jehc.jei.trap.GroundTrapRecipeCategory;
@@ -46,6 +47,7 @@ public void registerCategories(IRecipeCategoryRegistration reg)
4647
cats.add(new GroundTrapRecipeCategory(h));
4748
cats.add(new WaterTrapRecipeCategory(h));
4849
cats.add(new GrinderRecipeCategory(h));
50+
cats.add(new WaterFilterCategory(h));
4951
for(JehcRecipeCategory cat : cats)
5052
{
5153
reg.addRecipeCategories(cat);
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package ru.pearx.jehc.jei.machine;
2+
3+
import com.pam.harvestcraft.blocks.BlockRegistry;
4+
import com.pam.harvestcraft.item.ItemRegistry;
5+
import com.pam.harvestcraft.item.WaterFilterRecipes;
6+
import mezz.jei.api.IGuiHelper;
7+
import mezz.jei.api.IModRegistry;
8+
import net.minecraft.item.ItemStack;
9+
10+
/*
11+
* Created by mrAppleXZ on 05.07.18 2:57
12+
*/
13+
public class WaterFilterCategory extends MachineRecipeCategory
14+
{
15+
public WaterFilterCategory(IGuiHelper helper)
16+
{
17+
super("jehc.waterfilter", "jehc.waterfilter.name", "waterfilter", WaterFilterRecipes.class, "waterfilterList", helper);
18+
}
19+
20+
@Override
21+
public void setup(IModRegistry registry)
22+
{
23+
registry.addRecipeCatalyst(new ItemStack(BlockRegistry.waterfilterItemBlock), getUid());
24+
super.setup(registry);
25+
}
26+
}

src/main/resources/assets/jehc/lang/de_de.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ jehc.pressing.name=Pressen
22
jehc.shippingbin.name=Versandbehälter
33
jehc.market.name=Markt
44
jehc.price=Preis:
5-
jehc.apiary.name=Bienenhaus
5+
jehc.apiary.name=Bienenhaus

src/main/resources/assets/jehc/lang/en_us.lang

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ jehc.price=Price:
55
jehc.apiary.name=Apiary
66
jehc.ground_trap.name=Ground Trap
77
jehc.water_trap.name=Water Trap
8-
jehc.grinder.name=Grinder
8+
jehc.grinder.name=Grinder
9+
jehc.waterfilter.name=Water Filter

src/main/resources/assets/jehc/lang/ru_ru.lang

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ jehc.shippingbin.name=Ящик для продажи
33
jehc.market.name=Рынок
44
jehc.price=Цена:
55
jehc.apiary.name=Пасека
6-
jehc.grinder.name=Молотилка
6+
jehc.ground_trap.name=Ловушка
7+
jehc.water_trap.name=Морская ловушка
8+
jehc.grinder.name=Молотилка
9+
jehc.waterfilter.name=Водяной фильтр

0 commit comments

Comments
 (0)