Remove regular plate press, twin plate press is now the normal one
This commit is contained in:
parent
884336ffa1
commit
0dffe511fd
@ -88,7 +88,7 @@ fun addMachineAdvancements(serializer: Consumer<AdvancementHolder>, lang: Matter
|
|||||||
val press = AdvancementBuilder()
|
val press = AdvancementBuilder()
|
||||||
.parent(chem)
|
.parent(chem)
|
||||||
.display(
|
.display(
|
||||||
itemStack = ItemStack(MItems.PLATE_PRESS[null]!!),
|
itemStack = ItemStack(MItems.TWIN_PLATE_PRESS[null]!!),
|
||||||
title = translation.add("plate_press", "Bending the Material") {
|
title = translation.add("plate_press", "Bending the Material") {
|
||||||
russian("Раскатка металла")
|
russian("Раскатка металла")
|
||||||
},
|
},
|
||||||
@ -97,15 +97,12 @@ fun addMachineAdvancements(serializer: Consumer<AdvancementHolder>, lang: Matter
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
.also {
|
.also {
|
||||||
for ((i, m) in MItems.PLATE_PRESS.values.withIndex())
|
for ((i, m) in MItems.TWIN_PLATE_PRESS.values.withIndex())
|
||||||
it.addCriterion(i.toString(), criterion(m))
|
it.addCriterion(i.toString(), criterion(m))
|
||||||
}
|
}
|
||||||
.requirements(AdvancementRequirements.Strategy.OR)
|
.requirements(AdvancementRequirements.Strategy.OR)
|
||||||
.save(serializer, modLocation("machines/plate_press"))
|
.save(serializer, modLocation("machines/plate_press"))
|
||||||
|
|
||||||
CraftEntry(MItems.TWIN_PLATE_PRESS.values, "Twice the Thud",
|
|
||||||
russianName = "Двойной стук").make(serializer, press, translation)
|
|
||||||
|
|
||||||
CraftEntry(MItems.ENERGY_SERVO.values, "Power Goes In, Powered Things Go Out",
|
CraftEntry(MItems.ENERGY_SERVO.values, "Power Goes In, Powered Things Go Out",
|
||||||
russianName = "Энергия на вход, электроинструмент на выход").make(serializer, press, translation)
|
russianName = "Энергия на вход, электроинструмент на выход").make(serializer, press, translation)
|
||||||
|
|
||||||
|
@ -65,14 +65,21 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
|
|||||||
.unlockedBy(MItems.ENERGY_BUS)
|
.unlockedBy(MItems.ENERGY_BUS)
|
||||||
.build(consumer)
|
.build(consumer)
|
||||||
|
|
||||||
MatteryRecipe(MBlocks.PLATE_PRESS[null]!!, category = machinesCategory)
|
MatteryRecipe(MBlocks.TWIN_PLATE_PRESS[null]!!, category = machinesCategory)
|
||||||
.rowB(MItemTags.PISTONS)
|
.rowAC(MItems.ELECTROMOTOR, MItems.ELECTROMOTOR)
|
||||||
.rowB(MItems.MACHINE_FRAME)
|
.row(MItemTags.PISTONS, MItems.MACHINE_FRAME, MItemTags.PISTONS)
|
||||||
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
|
.unlockedBy(MItemTags.TRITANIUM_INGOTS)
|
||||||
.unlockedBy(MItems.ELECTRIC_PARTS)
|
|
||||||
.unlockedBy(MItems.MACHINE_FRAME)
|
.unlockedBy(MItems.MACHINE_FRAME)
|
||||||
.build(consumer)
|
.build(consumer)
|
||||||
|
|
||||||
|
for ((color, item) in MItems.PLATE_PRESS) {
|
||||||
|
MatteryRecipe(MBlocks.TWIN_PLATE_PRESS[color]!!, category = machinesCategory)
|
||||||
|
.setUpgradeSource(item)
|
||||||
|
.addUpgradeOps(UpgradeRecipe.All)
|
||||||
|
.rowA(item)
|
||||||
|
.build(consumer, "plate_press_migration/${color?.name?.lowercase() ?: "default"}")
|
||||||
|
}
|
||||||
|
|
||||||
MatteryRecipe(MBlocks.CHEMICAL_GENERATOR[null]!!, category = machinesCategory)
|
MatteryRecipe(MBlocks.CHEMICAL_GENERATOR[null]!!, category = machinesCategory)
|
||||||
.rowB(MItems.ENERGY_BUS)
|
.rowB(MItems.ENERGY_BUS)
|
||||||
.row(MItemTags.TRITANIUM_INGOTS, MItemTags.FURNACES, MItemTags.TRITANIUM_INGOTS)
|
.row(MItemTags.TRITANIUM_INGOTS, MItemTags.FURNACES, MItemTags.TRITANIUM_INGOTS)
|
||||||
@ -81,17 +88,6 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
|
|||||||
.unlockedBy(MItems.ENERGY_BUS)
|
.unlockedBy(MItems.ENERGY_BUS)
|
||||||
.build(consumer)
|
.build(consumer)
|
||||||
|
|
||||||
for ((color, press) in MBlocks.PLATE_PRESS) {
|
|
||||||
MatteryRecipe(MBlocks.TWIN_PLATE_PRESS[color]!!, category = machinesCategory)
|
|
||||||
.setUpgradeSource(press)
|
|
||||||
.addUpgradeOps(UpgradeRecipe.Direct("BlockEntityTag"))
|
|
||||||
.rowB(MItemTags.PISTONS)
|
|
||||||
.rowB(press)
|
|
||||||
.rowB(MItemTags.TRITANIUM_PLATES)
|
|
||||||
.unlockedBy(MBlocks.PLATE_PRESS.values)
|
|
||||||
.build(consumer, "twin_plate_press/${color?.name?.lowercase() ?: "default"}")
|
|
||||||
}
|
|
||||||
|
|
||||||
MatteryRecipe(MItems.PATTERN_DRIVE_NORMAL, category = machinesCategory)
|
MatteryRecipe(MItems.PATTERN_DRIVE_NORMAL, category = machinesCategory)
|
||||||
.rowAC(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT)
|
.rowAC(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT)
|
||||||
.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, MItemTags.ADVANCED_CIRCUIT)
|
.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, MItemTags.ADVANCED_CIRCUIT)
|
||||||
|
@ -274,7 +274,6 @@ fun addPainterRecipes(consumer: RecipeOutput) {
|
|||||||
val blocks = listOf(
|
val blocks = listOf(
|
||||||
MItems.COBBLESTONE_GENERATOR,
|
MItems.COBBLESTONE_GENERATOR,
|
||||||
MItems.ESSENCE_STORAGE,
|
MItems.ESSENCE_STORAGE,
|
||||||
MItems.PLATE_PRESS,
|
|
||||||
MItems.TWIN_PLATE_PRESS,
|
MItems.TWIN_PLATE_PRESS,
|
||||||
MItems.ITEM_MONITOR,
|
MItems.ITEM_MONITOR,
|
||||||
MItems.MATTER_BOTTLER,
|
MItems.MATTER_BOTTLER,
|
||||||
|
@ -76,7 +76,6 @@ class JEIPlugin : IModPlugin {
|
|||||||
MItems.POWERED_SMOKER.values.forEach { registration.addRecipeCatalyst(ItemStack(it), MicrowaveRecipeCategory.recipeType) }
|
MItems.POWERED_SMOKER.values.forEach { registration.addRecipeCatalyst(ItemStack(it), MicrowaveRecipeCategory.recipeType) }
|
||||||
registration.addRecipeCatalyst(ItemStack(MItems.ExopackUpgrades.CRAFTING_UPGRADE), RecipeTypes.CRAFTING)
|
registration.addRecipeCatalyst(ItemStack(MItems.ExopackUpgrades.CRAFTING_UPGRADE), RecipeTypes.CRAFTING)
|
||||||
registration.addRecipeCatalyst(ItemStack(MItems.ITEM_MONITOR[null]!!), RecipeTypes.CRAFTING)
|
registration.addRecipeCatalyst(ItemStack(MItems.ITEM_MONITOR[null]!!), RecipeTypes.CRAFTING)
|
||||||
MItems.PLATE_PRESS.values.forEach { registration.addRecipeCatalyst(ItemStack(it), PlatePressRecipeCategory.recipeType) }
|
|
||||||
MItems.TWIN_PLATE_PRESS.values.forEach { registration.addRecipeCatalyst(ItemStack(it), PlatePressRecipeCategory.recipeType) }
|
MItems.TWIN_PLATE_PRESS.values.forEach { registration.addRecipeCatalyst(ItemStack(it), PlatePressRecipeCategory.recipeType) }
|
||||||
registration.addRecipeCatalyst(ItemStack(MItems.PAINTER), PainterRecipeCategory.recipeType)
|
registration.addRecipeCatalyst(ItemStack(MItems.PAINTER), PainterRecipeCategory.recipeType)
|
||||||
registration.addRecipeCatalyst(ItemStack(MItems.MATTER_ENTANGLER), MatterEntanglerRecipeCategory.recipeType)
|
registration.addRecipeCatalyst(ItemStack(MItems.MATTER_ENTANGLER), MatterEntanglerRecipeCategory.recipeType)
|
||||||
|
@ -42,7 +42,7 @@ object PlatePressRecipeCategory : IRecipeCategory<PlatePressRecipe>, IDrawable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getTitle(): Component {
|
override fun getTitle(): Component {
|
||||||
return MItems.PLATE_PRESS[null]!!.description
|
return MItems.TWIN_PLATE_PRESS[null]!!.description
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) {
|
override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) {
|
||||||
@ -96,7 +96,7 @@ object PlatePressRecipeCategory : IRecipeCategory<PlatePressRecipe>, IDrawable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private val iconField by lazy {
|
private val iconField by lazy {
|
||||||
JEIPlugin.helpers.guiHelper.createDrawableItemStack(ItemStack(MItems.PLATE_PRESS[null]!!))
|
JEIPlugin.helpers.guiHelper.createDrawableItemStack(ItemStack(MItems.TWIN_PLATE_PRESS[null]!!))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getIcon(): IDrawable {
|
override fun getIcon(): IDrawable {
|
||||||
|
@ -76,7 +76,7 @@ class PlatePressRecipe(
|
|||||||
override fun getType(): RecipeType<PlatePressRecipe> = MRecipes.PLATE_PRESS
|
override fun getType(): RecipeType<PlatePressRecipe> = MRecipes.PLATE_PRESS
|
||||||
|
|
||||||
override fun getToastSymbol(): ItemStack {
|
override fun getToastSymbol(): ItemStack {
|
||||||
return ItemStack(MItems.PLATE_PRESS[null]!!)
|
return ItemStack(MItems.TWIN_PLATE_PRESS[null]!!)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun toFinished(id: ResourceLocation) = SERIALIZER.toFinished(this, id)
|
fun toFinished(id: ResourceLocation) = SERIALIZER.toFinished(this, id)
|
||||||
|
@ -115,7 +115,6 @@ object MItems {
|
|||||||
init {
|
init {
|
||||||
val machines = ArrayList<Supplier<BlockItem>>()
|
val machines = ArrayList<Supplier<BlockItem>>()
|
||||||
|
|
||||||
machines.addAll(PLATE_PRESS.asSupplierArray())
|
|
||||||
machines.addAll(TWIN_PLATE_PRESS.asSupplierArray())
|
machines.addAll(TWIN_PLATE_PRESS.asSupplierArray())
|
||||||
machines.addAll(POWERED_FURNACE.asSupplierArray())
|
machines.addAll(POWERED_FURNACE.asSupplierArray())
|
||||||
machines.addAll(POWERED_BLAST_FURNACE.asSupplierArray())
|
machines.addAll(POWERED_BLAST_FURNACE.asSupplierArray())
|
||||||
|
Loading…
Reference in New Issue
Block a user