mirror of
https://github.com/RoBaertschi/EnvironmentTech.git
synced 2025-06-05 02:23:28 +00:00
Compare commits
4 Commits
9137810d2f
...
9deb50b2c8
Author | SHA1 | Date | |
---|---|---|---|
9deb50b2c8 | |||
94719faedc | |||
02718721fa | |||
947e691753 |
2
.github/workflows/gradle.yml
vendored
2
.github/workflows/gradle.yml
vendored
@ -44,7 +44,7 @@ jobs:
|
||||
run: ./gradlew publish -ProbaertschiPassword=${{ secrets.REPOSILITE_SECRET }} -ProbaertschiUsername=${{ secrets.REPOSILITE_NAME }}
|
||||
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Artifacts
|
||||
path: build/libs
|
||||
|
@ -1,4 +1,4 @@
|
||||
// 1.21 2024-07-07T13:40:04.298488344 Item Models: environmenttech
|
||||
// 1.21.1 2024-12-09T14:59:53.785896902 Item Models: environmenttech
|
||||
ee3837b261f3dbe2001ba1192716f0fdf144b663 assets/environmenttech/models/item/env_collector.json
|
||||
719f96ed0245a9dc7c32294d66055e76fc594e30 assets/environmenttech/models/item/env_detector.json
|
||||
e6d7f80a803863d6196f53d67487af2b3644323b assets/environmenttech/models/item/env_detector_0.json
|
||||
|
@ -1,3 +1,4 @@
|
||||
// 1.21 2024-07-07T13:40:04.297878793 Block States: environmenttech
|
||||
// 1.21.1 2024-12-09T14:59:53.785039397 Block States: environmenttech
|
||||
6abc8b83d4fb4316ca2dbb977510e6f349ef9e9c assets/environmenttech/blockstates/env_collector.json
|
||||
f7e8f32de50650930080d0d5d1a24176774d4bb9 assets/environmenttech/blockstates/env_distributor.json
|
||||
bfdfed4f43d4013b3429cbd38800952e96e9b3cb assets/environmenttech/blockstates/heat_generator.json
|
||||
|
@ -1,4 +1,4 @@
|
||||
// 1.21 2024-07-07T13:40:04.298334877 Recipes
|
||||
// 1.21.1 2024-12-09T14:59:53.785699933 Recipes
|
||||
375ee3cb8eaf222bd0d5576061d1741b5b3d5cff data/environmenttech/advancement/recipes/environmental_essence.json
|
||||
99b83974e5a7a570c2111cab62a292d126c36524 data/environmenttech/advancement/recipes/misc/env_collector_block_item.json
|
||||
810a3e2750c6fe259d203216b1e5046e49e345d6 data/environmenttech/advancement/recipes/misc/env_distributor_block_item.json
|
||||
|
@ -0,0 +1,19 @@
|
||||
{
|
||||
"variants": {
|
||||
"facing=east": {
|
||||
"model": "environmenttech:block/heat_generator",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north": {
|
||||
"model": "environmenttech:block/heat_generator"
|
||||
},
|
||||
"facing=south": {
|
||||
"model": "environmenttech:block/heat_generator",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west": {
|
||||
"model": "environmenttech:block/heat_generator",
|
||||
"y": 270
|
||||
}
|
||||
}
|
||||
}
|
@ -54,7 +54,6 @@ public class JeiCompatPlugin implements IModPlugin {
|
||||
|
||||
@Override
|
||||
public void registerRecipes(IRecipeRegistration registration) {
|
||||
|
||||
assert Minecraft.getInstance().level != null;
|
||||
registration.addRecipes(EnvCollectorRecipeCategory.ENV_COLLECTOR, Minecraft.getInstance().level.getRecipeManager().getAllRecipesFor(ETRecipes.ENV_COLLECTOR_RECIPE_TYPE.get()).stream().toList());
|
||||
}
|
||||
|
@ -25,6 +25,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
|
||||
import xyz.robaertschi.environmenttech.ET;
|
||||
import xyz.robaertschi.environmenttech.level.block.ETBlocks;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.generators.HeatGeneratorBlockEntity;
|
||||
|
||||
|
||||
@SuppressWarnings("DataFlowIssue")
|
||||
|
@ -14,11 +14,13 @@
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package xyz.robaertschi.environmenttech.level.block.entity;
|
||||
package xyz.robaertschi.environmenttech.level.block.entity.generators;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
@ -28,9 +30,10 @@ import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import xyz.robaertschi.environmenttech.ET;
|
||||
import xyz.robaertschi.environmenttech.data.capabilities.EnvStorage;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.ITickableBlockEntity;
|
||||
|
||||
public class HeatGeneratorBlockEntity extends BlockEntity implements ITickableBlockEntity {
|
||||
private static final HashMap<Block, Long> BLOCK_TO_ENV = new HashMap<>(Map.of(Blocks.TORCH, 1L, Blocks.FIRE, 3L, Blocks.CAMPFIRE, 5L, Blocks.SOUL_TORCH, 6L, Blocks.SOUL_FIRE, 8L, Blocks.SOUL_CAMPFIRE, 10L, Blocks.LAVA, 14L));
|
@ -30,7 +30,7 @@ import com.mojang.serialization.MapCodec;
|
||||
|
||||
import xyz.robaertschi.environmenttech.level.block.SimpleBlockWithEntity;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.HeatGeneratorBlockEntity;
|
||||
import xyz.robaertschi.environmenttech.level.block.entity.generators.HeatGeneratorBlockEntity;
|
||||
|
||||
@MethodsReturnNonnullByDefault
|
||||
@ParametersAreNonnullByDefault
|
||||
|
Loading…
x
Reference in New Issue
Block a user