Skip to content

Commit

Permalink
Cargo rocket fuel (#90)
Browse files Browse the repository at this point in the history
* Update EntityCargoRocket.java

Testing if changing tier to 2 means that rocket fuel will be accepted.

* create tags?

* Update RecipeManagerGC.java

hopefully fixes missing fuel for cargorocket

* Allowing t2 fuel for cargo rocket

* gradle stuff

---------

Co-authored-by: Martin Robertz <[email protected]>
  • Loading branch information
Reflex18 and Dream-Master authored Jul 27, 2024
1 parent f4e023f commit 406913d
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
3 changes: 1 addition & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
dependencies {
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.71:dev')
implementation('com.github.GTNewHorizons:TinkersConstruct:1.12.5-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev')

api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-408-GTNH:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')

compileOnly('curse.maven:cofh-lib-220333:2388748')
compileOnly('curse.maven:PlayerAPI-228969:2248928')
compileOnly('curse.maven:RenderPlayerAPI-228981:2248933')
Expand Down
11 changes: 11 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ accessTransformersFile = micdoodlecore_at.cfg
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
usesMixins = true

# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
# Mixin classes will have access to "main" classes, but not the other way around.
separateMixinSourceSet =

# Adds some debug arguments like verbose output and class export.
usesMixinDebug = true

Expand Down Expand Up @@ -120,6 +125,12 @@ relocateShadowedDependencies = true
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
includeWellKnownRepositories = true

# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
# list of strings, with the acceptable keys being(case does not matter):
# cursemaven
# modrinth
excludeWellKnownRepositories =

# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25'
}


Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import micdoodle8.mods.galacticraft.core.util.GCLog;
import micdoodle8.mods.galacticraft.core.util.RecipeUtil;
import micdoodle8.mods.galacticraft.planets.asteroids.entities.EntityTier3Rocket;
import micdoodle8.mods.galacticraft.planets.mars.entities.EntityCargoRocket;
import micdoodle8.mods.galacticraft.planets.mars.entities.EntityTier2Rocket;
import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems;

Expand Down Expand Up @@ -69,6 +70,7 @@ private static void addUniversalRecipes() {
for (String fluidName : t2Fuels) {
RocketFuels.addFuel(EntityTier1Rocket.class, fluidName);
RocketFuels.addFuel(EntityTier2Rocket.class, fluidName);
RocketFuels.addFuel(EntityCargoRocket.class, fluidName);
}
for (String fluidName : t4Fuels) {
RocketFuels.addFuel(EntityTier3Rocket.class, fluidName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public void onPadDestroyed() {

@Override
public int getRocketTier() {
return Integer.MAX_VALUE;
return 2;
}

@Override
Expand Down

0 comments on commit 406913d

Please sign in to comment.