Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'net.neoforged.moddev' version '2.0.141'
id 'net.neoforged.moddev' version '2.0.148'
id 'idea'
id 'org.moddedmc.wiki.toolkit' version '0.4.1'
id "me.modmuss50.mod-publish-plugin" version "2.2.0"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ minecraft_version=26.1.2
# as they do not follow standard versioning conventions.
minecraft_version_range=[26.1.2]
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=26.1.2.109
neo_version=26.1.2.114

## Mod Properties

Expand Down Expand Up @@ -42,7 +42,7 @@ space_age_mod_group_id=rearth.oritech.spaceage
geckolib_version = 5.5.1

# runtime testing mods
jei_version = 29.20.0.53
jei_version = 29.43.0.106
wiki_exporter_version = 2.3.0+26.1.2

# datagen dep mods
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 4 additions & 7 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 12 additions & 24 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion space-age/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'net.neoforged.moddev' version '2.0.141'
id 'net.neoforged.moddev' version '2.0.148'
id 'idea'
id 'checkstyle'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ final class OritechJeiAtomicForgeRecipe extends AbstractRecipeCategory<RecipeHol
public void createRecipeExtras(IRecipeExtrasBuilder builder, RecipeHolder<OritechRecipe> holder,
IFocusGroup focuses) {
// Show the forge being charged from both sides. One laser is enough; additional input only makes it faster.
builder.addDrawable(endericLaser, 45, 3);
builder.addDrawableWidget(endericLaser).setPosition(45, 3);
builder.addText(Component.literal("→"), 10, 10).setPosition(64, 6);
builder.addDrawable(atomicForge, 77, 3);
builder.addDrawableWidget(atomicForge).setPosition(77, 3);
builder.addText(Component.literal("←"), 10, 10).setPosition(97, 6);
builder.addDrawable(endericLaser, 109, 3);
builder.addDrawableWidget(endericLaser).setPosition(109, 3);

builder.addAnimatedRecipeArrow(40).setPosition(70, 37);
builder.addAnimatedRecipeArrowWidget(40).setPosition(70, 37);

var totalEnergy = (long) OritechConfig.processingMachines.atomicForgeData.energyPerTick.get()
* holder.value().time();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class OritechJeiBedrockExtractorRecipe extends AbstractRecipeCategory<Reci
@Override
public void createRecipeExtras(IRecipeExtrasBuilder builder, RecipeHolder<OritechRecipe> recipe,
IFocusGroup focuses) {
builder.addAnimatedRecipeArrow(40).setPosition(65, 20);
builder.addAnimatedRecipeArrowWidget(40).setPosition(65, 20);
builder.addText(Component.translatable("emi.title.oritech.bedrock_extractor_placement"), WIDTH - 4, 10)
.setPosition(2, 60);
builder.addText(Component.translatable("emi.title.oritech.bedrock_extractor_infinite"), WIDTH - 4, 10)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ final class OritechJeiLaserRecipe extends AbstractRecipeCategory<RecipeHolder<Or
@Override
public void createRecipeExtras(IRecipeExtrasBuilder builder, RecipeHolder<OritechRecipe> recipe,
IFocusGroup focuses) {
builder.addDrawable(laserBackground, 10, 5);
builder.addAnimatedRecipeArrow(40).setPosition(105, 15);
builder.addDrawableWidget(laserBackground).setPosition(10, 5);
builder.addAnimatedRecipeArrowWidget(40).setPosition(105, 15);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class OritechJeiParticleCollisionRecipe extends AbstractRecipeCategory<Rec
@Override
public void createRecipeExtras(IRecipeExtrasBuilder builder, RecipeHolder<OritechRecipe> holder,
IFocusGroup focuses) {
builder.addAnimatedRecipeArrow(40).setPosition(57, 24);
builder.addAnimatedRecipeArrowWidget(40).setPosition(57, 24);
builder.addText(
Component.translatable("emi.title.oritech.collisionspeed", holder.value().time()),
WIDTH - 4, 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private static MachineBlockEntity createScreenProvider(Class<? extends MachineBl
public void createRecipeExtras(IRecipeExtrasBuilder builder, RecipeHolder<OritechRecipe> holder,
IFocusGroup focuses) {
var recipe = holder.value();
builder.addAnimatedRecipeArrow(40)
builder.addAnimatedRecipeArrowWidget(40)
.setPosition(indicator.x() - GUI_SLOT_OFFSET_X, indicator.y() - GUI_SLOT_OFFSET_Y);

var seconds = String.format("%.0f", recipe.time() / 20f);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class OritechJeiTaintedRefineryCreation

@Override
public void createRecipeExtras(IRecipeExtrasBuilder builder, CreationInfo recipe, IFocusGroup focuses) {
builder.addAnimatedRecipeArrow(40).setPosition(50, 22);
builder.addAnimatedRecipeArrowWidget(40).setPosition(50, 22);
builder.addText(Component.translatable("emi.title.oritech.tainted_creation_hint"), 156, 10)
.setPosition(2, 62);
builder.addText(Component.translatable("emi.title.oritech.tainted_creation_hint2"), 156, 10)
Expand Down
Loading