Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Advancements and New Crafting Station #26

Merged
merged 5 commits into from
Jul 10, 2021
Merged

Add Advancements and New Crafting Station #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c67e84f
add advancements
TechLord22 Jul 9, 2021
f364b88
New crafting station
TechLord22 Jul 9, 2021
1b1af02
Remove old and unused achievement lang
TechLord22 Jul 9, 2021
12f1603
add lcr advancement
TechLord22 Jul 10, 2021
3d4c256
remove old achievement lang from ru_ru and zh_cn
TechLord22 Jul 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate

public MetaTileEntityWorkbench(ResourceLocation metaTileEntityId) {
super(metaTileEntityId);
this.setPaintingColor(0xFFFFFF);
}

@Override
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
import gregtech.common.blocks.BlockMultiblockCasing;
import gregtech.common.blocks.BlockMultiblockCasing.MultiblockCasingType;
import gregtech.common.blocks.BlockWireCoil.CoilType;
import gregtech.common.blocks.HermeticCasings;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.items.MetaItems;
import gregtech.common.metatileentities.MetaTileEntities;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import scala.tools.cmd.Meta;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -354,7 +352,7 @@ public static void init() {
ModHandler.addShapedRecipe("steam_turbine_mv", MetaTileEntities.STEAM_TURBINE[1].getStackForm(), "PCP", "RMR", "EWE", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'E', MetaItems.ELECTRIC_MOTOR_MV, 'R', new UnificationEntry(OrePrefix.rotor, Materials.Bronze), 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), 'W', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Steel));
ModHandler.addShapedRecipe("steam_turbine_hv", MetaTileEntities.STEAM_TURBINE[2].getStackForm(), "PCP", "RMR", "EWE", 'M', MetaTileEntities.HULL[GTValues.HV].getStackForm(), 'E', MetaItems.ELECTRIC_MOTOR_HV, 'R', new UnificationEntry(OrePrefix.rotor, Materials.Steel), 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), 'W', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.StainlessSteel));

ModHandler.addShapedRecipe("workbench_bronze", MetaTileEntities.WORKBENCH.getStackForm(), "CWC", "PHP", "PhP", 'C', OreDictNames.chestWood, 'W', new ItemStack(Blocks.CRAFTING_TABLE), 'P', new UnificationEntry(OrePrefix.plate, Materials.Bronze), 'H', MetaBlocks.STEAM_CASING.getItemVariant(BRONZE_HULL));
ModHandler.addShapedRecipe("workbench_bronze", MetaTileEntities.WORKBENCH.getStackForm(), "CSC", "PWP", "PsP", 'C', OreDictNames.chestWood, 'W', new ItemStack(Blocks.CRAFTING_TABLE), 'S', OreDictUnifier.get("slabWood"), 'P', new ItemStack(Blocks.PLANKS, 1, GTValues.W));

ModHandler.addShapedRecipe("magic_energy_absorber", MetaTileEntities.MAGIC_ENERGY_ABSORBER.getStackForm(), "PCP", "PMP", "PCP", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'P', MetaItems.SENSOR_EV, 'C', new UnificationEntry(OrePrefix.circuit, Tier.Extreme));

Expand Down
28 changes: 28 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/47_nichrome_coil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.47_nichrome_coil.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.47_nichrome_coil.name"
},
"icon": {
"item": "gregtech:wire_coil",
"data": 2
}
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:wire_coil",
"data": 2
}
]
}
}
},
"parent": "gregtech:extreme_voltage/root_ev"
}
28 changes: 28 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/48_osmium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.48_osmium.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.48_osmium.name"
},
"icon": {
"item": "gregtech:meta_item_1",
"data": 10075
}
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"type": "forge:ore_dict",
"ore": "ingotOsmium"
}
]
}
}
},
"parent": "gregtech:extreme_voltage/47_nichrome_coil"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/49_nano_cpu_wafer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.49_nano_cpu_wafer.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.49_nano_cpu_wafer.name"
},
"icon": {
"item": "gregtech:meta_item_2",
"data": 32475
},
"frame": "goal"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:meta_item_2",
"data": 32475
}
]
}
}
},
"parent": "gregtech:extreme_voltage/root_ev"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/50_nano_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.50_nano_processor.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.50_nano_processor.name"
},
"icon": {
"item": "gregtech:meta_item_2",
"data": 32513
},
"frame": "challenge"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:meta_item_2",
"data": 32513
}
]
}
}
},
"parent": "gregtech:extreme_voltage/49_nano_cpu_wafer"
}
28 changes: 28 additions & 0 deletions ...in/resources/assets/gregtech/advancements/extreme_voltage/51_large_combustion_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.51_large_combustion_engine.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.51_large_combustion_engine.name"
},
"icon": {
"item": "gregtech:turbine_casing",
"data": 2
}
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:machine",
"data": 1007
}
]
}
}
},
"parent": "gregtech:extreme_voltage/root_ev"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/52_soc_wafer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.extreme_voltage.52_soc_wafer.desc"
},
"title": {
"translate": "gregtech.advancement.extreme_voltage.52_soc_wafer.name"
},
"icon": {
"item": "gregtech:meta_item_2",
"data": 32479
},
"frame": "goal"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:meta_item_2",
"data": 32479
}
]
}
}
},
"parent": "gregtech:extreme_voltage/root_ev"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/extreme_voltage/root_ev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.root_ev.desc"
},
"title": {
"translate": "gregtech.advancement.root_ev.name"
},
"icon": {
"item": "gregtech:machine",
"data": 1007
},
"frame": "goal",
"background": "gregtech:textures/blocks/casings/solid/machine_casing_stable_titanium.png"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"type": "forge:ore_dict",
"ore": "ingotTitanium"
}
]
}
}
}
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/high_voltage/40_workstation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.high_voltage.40_workstation.desc"
},
"title": {
"translate": "gregtech.advancement.high_voltage.40_workstation.name"
},
"icon": {
"item": "gregtech:meta_item_2",
"data": 32511
},
"frame": "goal"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:meta_item_2",
"data": 32511
}
]
}
}
},
"parent": "gregtech:high_voltage/root_hv"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/high_voltage/41_vacuum_freezer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.high_voltage.41_vacuum_freezer.desc"
},
"title": {
"translate": "gregtech.advancement.high_voltage.41_vacuum_freezer.name"
},
"icon": {
"item": "gregtech:machine",
"data": 1002
},
"frame": "challenge"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:machine",
"data": 1002
}
]
}
}
},
"parent": "gregtech:high_voltage/40_workstation"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/high_voltage/42_kanthal_coil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.high_voltage.42_kanthal_coil.desc"
},
"title": {
"translate": "gregtech.advancement.high_voltage.42_kanthal_coil.name"
},
"icon": {
"item": "gregtech:wire_coil",
"data": 1
},
"frame": "goal"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:wire_coil",
"data": 1
}
]
}
}
},
"parent": "gregtech:high_voltage/41_vacuum_freezer"
}
28 changes: 28 additions & 0 deletions src/main/resources/assets/gregtech/advancements/high_voltage/43_multi_smelter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.high_voltage.43_multi_smelter.desc"
},
"title": {
"translate": "gregtech.advancement.high_voltage.43_multi_smelter.name"
},
"icon": {
"item": "gregtech:machine",
"data": 1006
}
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:wire_coil",
"data": 1006
}
]
}
}
},
"parent": "gregtech:high_voltage/root_hv"
}
29 changes: 29 additions & 0 deletions src/main/resources/assets/gregtech/advancements/high_voltage/44_distillation_tower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"display": {
"description": {
"translate": "gregtech.advancement.high_voltage.44_distillation_tower.desc"
},
"title": {
"translate": "gregtech.advancement.high_voltage.44_distillation_tower.name"
},
"icon": {
"item": "gregtech:machine",
"data": 1005
},
"frame": "challenge"
},
"criteria": {
"location": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "gregtech:wire_coil",
"data": 1005
}
]
}
}
},
"parent": "gregtech:high_voltage/40_workstation"
}
Loading