Skip to content

修复一些问题 #45

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

Merged
RealSilverMoon merged 3 commits into from
Oct 23, 2025
Merged

修复一些问题 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6560bae
ADM研究原型调整为大激光;调整部分已弃用引用
luomolhx Oct 1, 2025
54d7941
调整大激光meta值
luomolhx Oct 1, 2025
40e87fe
处理依赖冲突的问题 修改配方中没有制作方式的材料
luomolhx Oct 21, 2025
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: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ minecraft {
dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
implementation 'org.ow2.asm:asm-commons:9.2'
}

tasks.withType(JavaCompile) {
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static gregtech.api.enums.Mods.*;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
import static gregtech.api.util.GTRecipeBuilder.*;
import static gregtech.api.util.GTRecipeConstants.*;

import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -173,8 +172,8 @@ public static void addRingRecipe() {
GTOreDictUnificator.get("ringAstralTitanium", 64), GTOreDictUnificator.get("ringAstralTitanium", 64),
GTOreDictUnificator.get("ringAstralTitanium", 64),
GTOreDictUnificator.get("plateDenseAstralTitanium", 64),
new Object[] { OrePrefixes.circuit.get(Materials.Optical), 32 },
GTOreDictUnificator.get("batteryUMV", 4), ItemList.Field_Generator_UEV.get(4),
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 32 }, GTOreDictUnificator.get("batteryUMV", 4),
ItemList.Field_Generator_UEV.get(4),
GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12),
GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12),
GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12),
Expand Down Expand Up @@ -554,7 +553,7 @@ public static void addUpgradeModuleRecipe() {
new Object[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1132),
ItemList.Electric_Motor_UEV.get(32), ItemList.Electric_Piston_UEV.get(8),
ItemList.Electric_Pump_UEV.get(16), ItemList.Conveyor_Module_UEV.get(8), ItemList.Robot_Arm_UEV.get(8),
new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 },
GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1),
GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 32),
GTOreDictUnificator.get("rotorAstralTitanium", 16), new ItemStack(BlockRegister.BoxRing2, 16), },
Expand All @@ -572,7 +571,7 @@ public static void addUpgradeModuleRecipe() {
new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10501),
GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12712),
GTOreDictUnificator.get("blockGlassUEV", 64), GTOreDictUnificator.get("slabWood", 1),
GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12718),
GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12713),
GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 4, 26),
new ItemStack(BlockRegister.BoxRing2, 16), },
new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000),
Expand Down Expand Up @@ -732,7 +731,7 @@ public static void addModuleResearchRecipe() {
// AMD 晶圆厂技术资料（基础）
GTValues.RA.stdBuilder()
.itemOutputs(new ItemStack(ItemRegister.bmResearchItem, 1, 0))
.itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 860))
.itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 3004))
.eut(TierEU.RECIPE_LuV)
.duration(1200)
.addTo(assemblerRecipes);
Expand Down
Loading