tilera/SteamPowered
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat: port to create 0.5.1

Browse source
This commit is contained in:
Timo Ley 2023-07-28 15:15:02 +02:00
parent 100d2da62c
commit 52bfdb7d82
40 changed files with 290 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build.gradle
View file

@ -88,6 +88,11 @@ mixin {
repositories {
mavenLocal()
maven {
//location of the maven for mixed mappings, registrate, and Flywheel
name = "tilera maven"
url = "https://maven.tilera.xyz/"
}
maven {
// location of the maven that hosts JEI files (And TiC)
name "Progwml6 maven"
@ -98,6 +103,18 @@ repositories {
name = "tterrag maven"
url = "https://maven.tterrag.com/"
}
maven {
// location of the maven for Curios API
url = "https://maven.theillusivec4.top/"
}
maven {
// location of maven for CC: Tweaked
name = "squiddev"
url = "https://squiddev.cc/maven/"
content {
includeGroup "org.squiddev"
}
}
maven {
//location of the maven for vazkii's mods
name "blamejared"
@ -114,8 +131,11 @@ repositories {
dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
implementation fg.deobf("curse.maven:create-328085:3737418")
implementation fg.deobf("curse.maven:flywheel-486392:3737402")
//implementation fg.deobf("curse.maven:create-328085:3737418")
//implementation fg.deobf("curse.maven:flywheel-486392:3737402")
implementation fg.deobf("com.simibubi.create:create-1.18.2:0.5.1.c:all")
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.18.2:0.6.9-101")
implementation fg.deobf("com.tterrag.registrate:Registrate:MC1.18.2-1.1.3")
//implementation fg.deobf("curse.maven:immersive-engineering-231951:3377691")
//implementation fg.deobf("curse.maven:create-alloyed-564792:3602444")

14
src/main/java/com/teammoeg/steampowered/SPStress.java
View file

@ -1,9 +1,10 @@
package com.teammoeg.steampowered;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
import com.simibubi.create.foundation.block.BlockStressDefaults;
import com.simibubi.create.foundation.block.BlockStressValues.IStressValueProvider;
import com.simibubi.create.content.kinetics.BlockStressDefaults;
import com.simibubi.create.content.kinetics.BlockStressValues.IStressValueProvider;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineBlock;
import com.simibubi.create.foundation.utility.Couple;
import com.teammoeg.steampowered.content.alternator.DynamoBlock;
import net.minecraft.world.level.block.Block;
@ -51,4 +52,9 @@ public class SPStress implements IStressValueProvider {
return true;
}
@Override
public Couple<Integer> getGeneratedRPM(Block block) {
return null; //TODO: WTF
}
}

8
src/main/java/com/teammoeg/steampowered/SteamPowered.java
View file

@ -23,15 +23,15 @@ import javax.annotation.Nonnull;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.simibubi.create.foundation.block.BlockStressValues;
import com.simibubi.create.content.kinetics.BlockStressValues;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.repack.registrate.util.nullness.NonNullSupplier;
import com.teammoeg.steampowered.client.Particles;
import com.teammoeg.steampowered.client.SteamPoweredClient;
import com.teammoeg.steampowered.network.PacketHandler;
import com.teammoeg.steampowered.registrate.SPBlocks;
import com.teammoeg.steampowered.registrate.SPItems;
import com.teammoeg.steampowered.registrate.SPTiles;
import com.tterrag.registrate.util.nullness.NonNullSupplier;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
@ -64,7 +64,7 @@ public class SteamPowered {
}
};
public static final NonNullSupplier<CreateRegistrate> registrate = CreateRegistrate.lazy(MODID);
public static final CreateRegistrate registrate = CreateRegistrate.create(MODID);
// Directly reference a log4j logger.
private static final Logger LOGGER = LogManager.getLogger();
@ -74,6 +74,8 @@ public class SteamPowered {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
MinecraftForge.EVENT_BUS.register(this);
registrate.registerEventListeners(FMLJavaModLoadingContext.get().getModEventBus());
DistExecutor.unsafeRunWhenOn(Dist.CLIENT,
() -> () -> SteamPoweredClient.addClientListeners(MinecraftForge.EVENT_BUS, FMLJavaModLoadingContext.get().getModEventBus()));

20
src/main/java/com/teammoeg/steampowered/client/instance/BronzeFlywheelInstance.java
View file

@ -27,11 +27,11 @@ import com.jozufozu.flywheel.api.instance.DynamicInstance;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.KineticTileInstance;
import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.teammoeg.steampowered.block.SPBlockPartials;
@ -44,10 +44,10 @@ import net.minecraft.world.level.block.state.BlockState;
import java.util.Collections;
import java.util.List;
import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
public class BronzeFlywheelInstance extends KineticTileInstance<FlywheelTileEntity> implements DynamicInstance {
public class BronzeFlywheelInstance extends KineticBlockEntityInstance<FlywheelBlockEntity> implements DynamicInstance {
protected final Direction facing;
protected final Direction connection;
@ -66,7 +66,7 @@ public class BronzeFlywheelInstance extends KineticTileInstance<FlywheelTileEnti
protected float lastAngle = Float.NaN;
public BronzeFlywheelInstance(MaterialManager modelManager, FlywheelTileEntity tile) {
public BronzeFlywheelInstance(MaterialManager modelManager, FlywheelBlockEntity tile) {
super(modelManager, tile);
facing = blockState.getValue(HORIZONTAL_FACING);
@ -108,7 +108,7 @@ public class BronzeFlywheelInstance extends KineticTileInstance<FlywheelTileEnti
// Mixin
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) blockEntity;
float speed = access.getVisualSpeed().get(partialTicks) * 3 / 10f;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3 / 10f;
float angle = access.getAngle() + speed * partialTicks;
if (Math.abs(angle - lastAngle) < 0.001) return;
@ -185,7 +185,7 @@ public class BronzeFlywheelInstance extends KineticTileInstance<FlywheelTileEnti
protected Instancer<RotatingData> shaftModel() {
Direction opposite = facing.getOpposite();
return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, opposite);
return getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, opposite);
}
protected void transformConnector(TransformStack ms, boolean upper, boolean rotating, float angle, boolean flip) {

20
src/main/java/com/teammoeg/steampowered/client/instance/CastIronFlywheelInstance.java
View file

@ -27,11 +27,11 @@ import com.jozufozu.flywheel.api.instance.DynamicInstance;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.KineticTileInstance;
import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.teammoeg.steampowered.block.SPBlockPartials;
@ -44,10 +44,10 @@ import net.minecraft.world.level.block.state.BlockState;
import java.util.Collections;
import java.util.List;
import static com.simibubi.create.content.logistics.block.funnel.AbstractHorizontalFunnelBlock.HORIZONTAL_FACING;
import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
public class CastIronFlywheelInstance extends KineticTileInstance<FlywheelTileEntity> implements DynamicInstance {
public class CastIronFlywheelInstance extends KineticBlockEntityInstance<FlywheelBlockEntity> implements DynamicInstance {
protected final Direction facing;
protected final Direction connection;
@ -66,7 +66,7 @@ public class CastIronFlywheelInstance extends KineticTileInstance<FlywheelTileEn
protected float lastAngle = Float.NaN;
public CastIronFlywheelInstance(MaterialManager modelManager, FlywheelTileEntity tile) {
public CastIronFlywheelInstance(MaterialManager modelManager, FlywheelBlockEntity tile) {
super(modelManager, tile);
facing = blockState.getValue(HORIZONTAL_FACING);
@ -108,7 +108,7 @@ public class CastIronFlywheelInstance extends KineticTileInstance<FlywheelTileEn
// Mixin
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) blockEntity;
float speed = access.getVisualSpeed().get(partialTicks) * 3 / 10f;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3 / 10f;
float angle = access.getAngle() + speed * partialTicks;
if (Math.abs(angle - lastAngle) < 0.001) return;
@ -185,7 +185,7 @@ public class CastIronFlywheelInstance extends KineticTileInstance<FlywheelTileEn
protected Instancer<RotatingData> shaftModel() {
Direction opposite = facing.getOpposite();
return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, opposite);
return getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, opposite);
}
protected void transformConnector(TransformStack ms, boolean upper, boolean rotating, float angle, boolean flip) {

20
src/main/java/com/teammoeg/steampowered/client/instance/SteelFlywheelInstance.java
View file

@ -27,11 +27,11 @@ import com.jozufozu.flywheel.api.instance.DynamicInstance;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.KineticTileInstance;
import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.teammoeg.steampowered.block.SPBlockPartials;
@ -44,10 +44,10 @@ import net.minecraft.world.level.block.state.BlockState;
import java.util.Collections;
import java.util.List;
import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
public class SteelFlywheelInstance extends KineticTileInstance<FlywheelTileEntity> implements DynamicInstance {
public class SteelFlywheelInstance extends KineticBlockEntityInstance<FlywheelBlockEntity> implements DynamicInstance {
protected final Direction facing;
protected final Direction connection;
@ -66,7 +66,7 @@ public class SteelFlywheelInstance extends KineticTileInstance<FlywheelTileEntit
protected float lastAngle = Float.NaN;
public SteelFlywheelInstance(MaterialManager modelManager, FlywheelTileEntity tile) {
public SteelFlywheelInstance(MaterialManager modelManager, FlywheelBlockEntity tile) {
super(modelManager, tile);
facing = blockState.getValue(HORIZONTAL_FACING);
@ -108,7 +108,7 @@ public class SteelFlywheelInstance extends KineticTileInstance<FlywheelTileEntit
// Mixin
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) blockEntity;
float speed = access.getVisualSpeed().get(partialTicks) * 3 / 10f;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3 / 10f;
float angle = access.getAngle() + speed * partialTicks;
if (Math.abs(angle - lastAngle) < 0.001) return;
@ -185,7 +185,7 @@ public class SteelFlywheelInstance extends KineticTileInstance<FlywheelTileEntit
protected Instancer<RotatingData> shaftModel() {
Direction opposite = facing.getOpposite();
return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, opposite);
return getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, opposite);
}
protected void transformConnector(TransformStack ms, boolean upper, boolean rotating, float angle, boolean flip) {

28
src/main/java/com/teammoeg/steampowered/client/render/BronzeFlywheelRenderer.java
View file

@ -21,12 +21,12 @@ package com.teammoeg.steampowered.client.render;
import com.jozufozu.flywheel.backend.Backend;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.render.CachedBufferer;
import com.simibubi.create.foundation.render.SuperByteBuffer;
import com.simibubi.create.foundation.utility.AngleHelper;
@ -43,19 +43,20 @@ import net.minecraft.core.Direction;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.util.Mth;
public class BronzeFlywheelRenderer extends KineticTileEntityRenderer {
public class BronzeFlywheelRenderer extends KineticBlockEntityRenderer<KineticBlockEntity> {
public BronzeFlywheelRenderer(Context context) {
super(context);
}
protected void renderSafe(KineticTileEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
@Override
protected void renderSafe(KineticBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
if (!Backend.canUseInstancing(te.getLevel())) {
BlockState blockState = te.getBlockState();
FlywheelTileEntity wte = (FlywheelTileEntity) te;
FlywheelBlockEntity wte = (FlywheelBlockEntity) te;
// Mixin starts
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) wte;
float speed = access.getVisualSpeed().get(partialTicks) * 3.0F / 10.0F;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3.0F / 10.0F;
float angle = access.getAngle() + speed * partialTicks;
// Mixin ends
VertexConsumer vb = buffer.getBuffer(RenderType.solid());
@ -74,7 +75,7 @@ public class BronzeFlywheelRenderer extends KineticTileEntityRenderer {
}
}
private void renderFlywheel(KineticTileEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
private void renderFlywheel(KineticBlockEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
BlockState referenceState = blockState.rotate(Rotation.CLOCKWISE_90);
Direction facing = (Direction) referenceState.getValue(BlockStateProperties.HORIZONTAL_FACING);
SuperByteBuffer wheel = CachedBufferer.partialFacing(SPBlockPartials.BRONZE_FLYWHEEL, referenceState, facing);
@ -82,8 +83,9 @@ public class BronzeFlywheelRenderer extends KineticTileEntityRenderer {
wheel.renderInto(ms, vb);
}
protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
return CachedBufferer.partialFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
@Override
protected SuperByteBuffer getRotatedModel(KineticBlockEntity te, BlockState state) {
return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
}
protected SuperByteBuffer transformConnector(SuperByteBuffer buffer, boolean upper, boolean rotating, float angle, boolean flip) {

28
src/main/java/com/teammoeg/steampowered/client/render/CastIronFlywheelRenderer.java
View file

@ -21,12 +21,12 @@ package com.teammoeg.steampowered.client.render;
import com.jozufozu.flywheel.backend.Backend;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.render.CachedBufferer;
import com.simibubi.create.foundation.render.SuperByteBuffer;
import com.simibubi.create.foundation.utility.AngleHelper;
@ -43,19 +43,20 @@ import net.minecraft.core.Direction;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.util.Mth;
public class CastIronFlywheelRenderer extends KineticTileEntityRenderer {
public class CastIronFlywheelRenderer extends KineticBlockEntityRenderer<KineticBlockEntity> {
public CastIronFlywheelRenderer(Context context) {
super(context);
}
protected void renderSafe(KineticTileEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
@Override
protected void renderSafe(KineticBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
if (!Backend.canUseInstancing(te.getLevel())) {
BlockState blockState = te.getBlockState();
FlywheelTileEntity wte = (FlywheelTileEntity) te;
FlywheelBlockEntity wte = (FlywheelBlockEntity) te;
// Mixin starts
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) wte;
float speed = access.getVisualSpeed().get(partialTicks) * 3.0F / 10.0F;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3.0F / 10.0F;
float angle = access.getAngle() + speed * partialTicks;
// Mixin ends
VertexConsumer vb = buffer.getBuffer(RenderType.solid());
@ -74,7 +75,7 @@ public class CastIronFlywheelRenderer extends KineticTileEntityRenderer {
}
}
private void renderFlywheel(KineticTileEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
private void renderFlywheel(KineticBlockEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
BlockState referenceState = blockState.rotate(Rotation.CLOCKWISE_90);
Direction facing = (Direction) referenceState.getValue(BlockStateProperties.HORIZONTAL_FACING);
SuperByteBuffer wheel = CachedBufferer.partialFacing(SPBlockPartials.CAST_IRON_FLYWHEEL, referenceState, facing);
@ -82,8 +83,9 @@ public class CastIronFlywheelRenderer extends KineticTileEntityRenderer {
wheel.renderInto(ms, vb);
}
protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
return CachedBufferer.partialFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
@Override
protected SuperByteBuffer getRotatedModel(KineticBlockEntity te, BlockState state) {
return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
}
protected SuperByteBuffer transformConnector(SuperByteBuffer buffer, boolean upper, boolean rotating, float angle, boolean flip) {

28
src/main/java/com/teammoeg/steampowered/client/render/SteelFlywheelRenderer.java
View file

@ -21,12 +21,12 @@ package com.teammoeg.steampowered.client.render;
import com.jozufozu.flywheel.backend.Backend;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.render.CachedBufferer;
import com.simibubi.create.foundation.render.SuperByteBuffer;
import com.simibubi.create.foundation.utility.AngleHelper;
@ -43,19 +43,20 @@ import net.minecraft.core.Direction;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.util.Mth;
public class SteelFlywheelRenderer extends KineticTileEntityRenderer {
public class SteelFlywheelRenderer extends KineticBlockEntityRenderer<KineticBlockEntity> {
public SteelFlywheelRenderer(Context context) {
super(context);
}
protected void renderSafe(KineticTileEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
@Override
protected void renderSafe(KineticBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
if (!Backend.canUseInstancing(te.getLevel())) {
BlockState blockState = te.getBlockState();
FlywheelTileEntity wte = (FlywheelTileEntity) te;
FlywheelBlockEntity wte = (FlywheelBlockEntity) te;
// Mixin starts
FlywheelTileEntityAccess access = (FlywheelTileEntityAccess) wte;
float speed = access.getVisualSpeed().get(partialTicks) * 3.0F / 10.0F;
float speed = access.getVisualSpeed().getValue(partialTicks) * 3.0F / 10.0F;
float angle = access.getAngle() + speed * partialTicks;
// Mixin ends
VertexConsumer vb = buffer.getBuffer(RenderType.solid());
@ -74,7 +75,7 @@ public class SteelFlywheelRenderer extends KineticTileEntityRenderer {
}
}
private void renderFlywheel(KineticTileEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
private void renderFlywheel(KineticBlockEntity te, PoseStack ms, int light, BlockState blockState, float angle, VertexConsumer vb) {
BlockState referenceState = blockState.rotate(Rotation.CLOCKWISE_90);
Direction facing = (Direction) referenceState.getValue(BlockStateProperties.HORIZONTAL_FACING);
SuperByteBuffer wheel = CachedBufferer.partialFacing(SPBlockPartials.STEEL_FLYWHEEL, referenceState, facing);
@ -82,8 +83,9 @@ public class SteelFlywheelRenderer extends KineticTileEntityRenderer {
wheel.renderInto(ms, vb);
}
protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
return CachedBufferer.partialFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
@Override
protected SuperByteBuffer getRotatedModel(KineticBlockEntity te, BlockState state) {
return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, te.getBlockState(), ((Direction) te.getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING)).getOpposite());
}
protected SuperByteBuffer transformConnector(SuperByteBuffer buffer, boolean upper, boolean rotating, float angle, boolean flip) {

21
src/main/java/com/teammoeg/steampowered/content/alternator/DynamoBlock.java
View file

@ -18,11 +18,11 @@
package com.teammoeg.steampowered.content.alternator;
import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
import com.simibubi.create.content.contraptions.base.IRotate;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
import com.simibubi.create.content.kinetics.base.IRotate;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.VoxelShaper;
import com.teammoeg.steampowered.block.SPShapes;
@ -57,7 +57,7 @@ import java.util.Random;
* @author MRH0
* @author yuesha-yc
*/
public class DynamoBlock extends DirectionalKineticBlock implements ITE<DynamoTileEntity>, IRotate {
public class DynamoBlock extends DirectionalKineticBlock implements IBE<DynamoTileEntity>, IRotate {
public static final BooleanProperty REDSTONE_LOCKED = BooleanProperty.create("redstone_locked");
public static final VoxelShaper DYNAMO_SHAPE = SPShapes
@ -101,12 +101,12 @@ public class DynamoBlock extends DirectionalKineticBlock implements ITE<DynamoTi
}
@Override
public Class<DynamoTileEntity> getTileEntityClass() {
public Class<DynamoTileEntity> getBlockEntityClass() {
return DynamoTileEntity.class;
}
@Override
public BlockEntityType<? extends DynamoTileEntity> getTileEntityType() {
public BlockEntityType<? extends DynamoTileEntity> getBlockEntityType() {
return SPTiles.DYNAMO.get();
}
@ -130,14 +130,15 @@ public class DynamoBlock extends DirectionalKineticBlock implements ITE<DynamoTi
if(Screen.hasShiftDown()) {
t.add(new TranslatableComponent("tooltip.steampowered.alternator.thanks").withStyle(ChatFormatting.GOLD));
}else {
t.add(TooltipHelper.holdShift(Palette.Gray,false));
t.add(TooltipHelper.holdShift(Palette.GRAY,false));
}
if(Screen.hasControlDown()) {
t.add(new TranslatableComponent("tooltip.steampowered.alternator.redstone").withStyle(ChatFormatting.RED));
}else {
t.add(Lang.translate("tooltip.holdForControls", Lang.translate("tooltip.keyCtrl")
.withStyle(ChatFormatting.GRAY))
.withStyle(ChatFormatting.DARK_GRAY));
.style(ChatFormatting.GRAY))
.style(ChatFormatting.DARK_GRAY)
.component());
}
/*if (ModList.get().isLoaded("createaddition")) {
if (SPConfig.SERVER.disableDynamo.get()) {

8
src/main/java/com/teammoeg/steampowered/content/alternator/DynamoShaftInstance.java
View file

@ -1,14 +1,14 @@
package com.teammoeg.steampowered.content.alternator;
import com.jozufozu.flywheel.api.MaterialManager;
import com.simibubi.create.content.contraptions.base.HalfShaftInstance;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.kinetics.base.HalfShaftInstance;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import net.minecraft.core.Direction;
public class DynamoShaftInstance extends HalfShaftInstance {
public class DynamoShaftInstance extends HalfShaftInstance<KineticBlockEntity> {
public DynamoShaftInstance(MaterialManager modelManager, KineticTileEntity tile) {
public DynamoShaftInstance(MaterialManager modelManager, KineticBlockEntity tile) {
super(modelManager, tile);
}
@Override

10
src/main/java/com/teammoeg/steampowered/content/alternator/DynamoTileEntity.java
View file

@ -20,7 +20,7 @@ package com.teammoeg.steampowered.content.alternator;
import java.util.List;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.foundation.utility.Lang;
import com.teammoeg.steampowered.SPConfig;
@ -45,7 +45,7 @@ import net.minecraftforge.energy.IEnergyStorage;
* @author MRH0
* @author yuesha-yc
*/
public class DynamoTileEntity extends KineticTileEntity {
public class DynamoTileEntity extends KineticBlockEntity {
protected final InternalEnergyStorage energy;
private LazyOptional<IEnergyStorage> lazyEnergy;
@ -70,7 +70,7 @@ public class DynamoTileEntity extends KineticTileEntity {
}
tooltip.add(new TextComponent(spacing).append(new TranslatableComponent("tooltip.steampowered.energy.production").withStyle(ChatFormatting.GRAY)));
tooltip.add(new TextComponent(spacing).append(new TextComponent(" " + format(getEnergyProductionRate((int) (isSpeedRequirementFulfilled() ? getSpeed() : 0))) + "fe/t ") // fix
.withStyle(ChatFormatting.AQUA)).append(Lang.translate("gui.goggles.at_current_speed").withStyle(ChatFormatting.DARK_GRAY)));
.withStyle(ChatFormatting.AQUA)).append(Lang.translate("gui.goggles.at_current_speed").style(ChatFormatting.DARK_GRAY).component()));
return super.addToGoggleTooltip(tooltip, isPlayerSneaking);
}
@ -136,8 +136,8 @@ public class DynamoTileEntity extends KineticTileEntity {
}
@Override
public void setRemoved() {
super.setRemoved();
public void invalidate() {
super.invalidate();
lazyEnergy.invalidate();
}

9
src/main/java/com/teammoeg/steampowered/content/boiler/BoilerBlock.java
View file

@ -21,8 +21,8 @@ package com.teammoeg.steampowered.content.boiler;
import java.util.List;
import java.util.Random;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.simibubi.create.foundation.utility.Lang;
import com.teammoeg.steampowered.client.ClientUtils;
import com.teammoeg.steampowered.client.Particles;
@ -137,15 +137,16 @@ public abstract class BoilerBlock extends Block implements LiquidBlockContainer
.withStyle(ChatFormatting.GOLD));
}
} else {
t.add(TooltipHelper.holdShift(Palette.Gray, false));
t.add(TooltipHelper.holdShift(Palette.GRAY, false));
}
if (Screen.hasControlDown()) {
t.add(new TranslatableComponent("tooltip.steampowered.boiler.redstone").withStyle(ChatFormatting.RED));
} else {
t.add(Lang
.translate("tooltip.holdForControls",
Lang.translate("tooltip.keyCtrl").withStyle(ChatFormatting.GRAY))
.withStyle(ChatFormatting.DARK_GRAY));
Lang.translate("tooltip.keyCtrl").style(ChatFormatting.GRAY))
.style(ChatFormatting.DARK_GRAY)
.component());
}
super.appendHoverText(i, w, t, f);
}

10
src/main/java/com/teammoeg/steampowered/content/boiler/BoilerTileEntity.java
View file

@ -18,9 +18,9 @@
package com.teammoeg.steampowered.content.boiler;
import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.teammoeg.steampowered.FluidRegistry;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.content.burner.IHeatReceiver;
@ -41,7 +41,7 @@ import net.minecraftforge.fluids.capability.templates.FluidTank;
import java.util.List;
public abstract class BoilerTileEntity extends SmartTileEntity implements IHeatReceiver, IHaveGoggleInformation {
public abstract class BoilerTileEntity extends SmartBlockEntity implements IHeatReceiver, IHaveGoggleInformation {
FluidTank input = new FluidTank(10000,s->s.getFluid() == Fluids.WATER);
FluidTank output = new FluidTank(10000);
private IFluidHandler ft = new IFluidHandler() {
@ -98,7 +98,7 @@ public abstract class BoilerTileEntity extends SmartTileEntity implements IHeatR
}
@Override
public void addBehaviours(List<TileEntityBehaviour> behaviours) {}
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {}
@Override
public void write(CompoundTag nbt, boolean clientPacket) {

8
src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerBlock.java
View file

@ -18,7 +18,7 @@
package com.teammoeg.steampowered.content.boiler;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -29,7 +29,7 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class BronzeBoilerBlock extends BoilerBlock implements ITE<BronzeBoilerTileEntity> {
public class BronzeBoilerBlock extends BoilerBlock implements IBE<BronzeBoilerTileEntity> {
public BronzeBoilerBlock(Properties properties) {
super(properties);
}
@ -40,12 +40,12 @@ public class BronzeBoilerBlock extends BoilerBlock implements ITE<BronzeBoilerTi
}
@Override
public Class<BronzeBoilerTileEntity> getTileEntityClass() {
public Class<BronzeBoilerTileEntity> getBlockEntityClass() {
return BronzeBoilerTileEntity.class;
}
@Override
public BlockEntityType<? extends BronzeBoilerTileEntity> getTileEntityType() {
public BlockEntityType<? extends BronzeBoilerTileEntity> getBlockEntityType() {
return SPTiles.BRONZE_BOILER.get();
}
}

8
src/main/java/com/teammoeg/steampowered/content/boiler/CastIronBoilerBlock.java
View file

@ -18,7 +18,7 @@
package com.teammoeg.steampowered.content.boiler;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -29,7 +29,7 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class CastIronBoilerBlock extends BoilerBlock implements ITE<CastIronBoilerTileEntity> {
public class CastIronBoilerBlock extends BoilerBlock implements IBE<CastIronBoilerTileEntity> {
public CastIronBoilerBlock(Properties properties) {
super(properties);
}
@ -40,12 +40,12 @@ public class CastIronBoilerBlock extends BoilerBlock implements ITE<CastIronBoil
}
@Override
public Class<CastIronBoilerTileEntity> getTileEntityClass() {
public Class<CastIronBoilerTileEntity> getBlockEntityClass() {
return CastIronBoilerTileEntity.class;
}
@Override
public BlockEntityType<? extends CastIronBoilerTileEntity> getTileEntityType() {
public BlockEntityType<? extends CastIronBoilerTileEntity> getBlockEntityType() {
return SPTiles.CAST_IRON_BOILER.get();
}
}

8
src/main/java/com/teammoeg/steampowered/content/boiler/SteelBoilerBlock.java
View file

@ -18,7 +18,7 @@
package com.teammoeg.steampowered.content.boiler;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -29,7 +29,7 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class SteelBoilerBlock extends BoilerBlock implements ITE<SteelBoilerTileEntity> {
public class SteelBoilerBlock extends BoilerBlock implements IBE<SteelBoilerTileEntity> {
public SteelBoilerBlock(Properties properties) {
super(properties);
}
@ -40,12 +40,12 @@ public class SteelBoilerBlock extends BoilerBlock implements ITE<SteelBoilerTile
}
@Override
public Class<SteelBoilerTileEntity> getTileEntityClass() {
public Class<SteelBoilerTileEntity> getBlockEntityClass() {
return SteelBoilerTileEntity.class;
}
@Override
public BlockEntityType<? extends SteelBoilerTileEntity> getTileEntityType() {
public BlockEntityType<? extends SteelBoilerTileEntity> getBlockEntityType() {
return SPTiles.STEEL_BOILER.get();
}
}

8
src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerBlock.java
View file

@ -18,7 +18,7 @@
package com.teammoeg.steampowered.content.burner;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -28,7 +28,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.BlockGetter;
public class BronzeBurnerBlock extends BurnerBlock implements ITE<BronzeBurnerTileEntity> {
public class BronzeBurnerBlock extends BurnerBlock implements IBE<BronzeBurnerTileEntity> {
public BronzeBurnerBlock(Properties properties) {
super(properties);
}
@ -44,12 +44,12 @@ public class BronzeBurnerBlock extends BurnerBlock implements ITE<BronzeBurnerTi
}
@Override
public Class<BronzeBurnerTileEntity> getTileEntityClass() {
public Class<BronzeBurnerTileEntity> getBlockEntityClass() {
return BronzeBurnerTileEntity.class;
}
@Override
public BlockEntityType<? extends BronzeBurnerTileEntity> getTileEntityType() {
public BlockEntityType<? extends BronzeBurnerTileEntity> getBlockEntityType() {
return SPTiles.BRONZE_BURNER.get();
}
}

9
src/main/java/com/teammoeg/steampowered/content/burner/BurnerBlock.java
View file

@ -21,8 +21,8 @@ package com.teammoeg.steampowered.content.burner;
import java.util.List;
import java.util.Random;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.simibubi.create.foundation.utility.Lang;
import com.teammoeg.steampowered.client.ClientUtils;
import net.minecraft.world.item.Items;
@ -126,14 +126,15 @@ public abstract class BurnerBlock extends Block {
t.add(new TranslatableComponent("tooltip.steampowered.burner.danger").withStyle(ChatFormatting.RED));
}
}else {
t.add(TooltipHelper.holdShift(Palette.Gray,false));
t.add(TooltipHelper.holdShift(Palette.GRAY,false));
}
if(Screen.hasControlDown()) {
t.add(new TranslatableComponent("tooltip.steampowered.burner.redstone").withStyle(ChatFormatting.RED));
}else {
t.add(Lang.translate("tooltip.holdForControls", Lang.translate("tooltip.keyCtrl")
.withStyle(ChatFormatting.GRAY))
.withStyle(ChatFormatting.DARK_GRAY));
.style(ChatFormatting.GRAY))
.style(ChatFormatting.DARK_GRAY)
.component());
}
super.appendHoverText(i,w,t,f);
}

10
src/main/java/com/teammoeg/steampowered/content/burner/BurnerTileEntity.java
View file

@ -20,9 +20,9 @@ package com.teammoeg.steampowered.content.burner;
import java.util.List;
import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.teammoeg.steampowered.SPConfig;
import net.minecraft.core.BlockPos;
@ -43,7 +43,7 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemStackHandler;
public abstract class BurnerTileEntity extends SmartTileEntity implements IHaveGoggleInformation {
public abstract class BurnerTileEntity extends SmartBlockEntity implements IHaveGoggleInformation {
private ItemStackHandler inv = new ItemStackHandler() {
@Override
@ -61,7 +61,7 @@ public abstract class BurnerTileEntity extends SmartTileEntity implements IHaveG
}
@Override
public void addBehaviours(List<TileEntityBehaviour> behaviours) {}
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {}
@Override
public void read(CompoundTag nbt, boolean clientPacket) {

8
src/main/java/com/teammoeg/steampowered/content/burner/CastIronBurnerBlock.java
View file

@ -18,12 +18,12 @@
package com.teammoeg.steampowered.content.burner;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.world.level.block.entity.BlockEntityType;
public class CastIronBurnerBlock extends BurnerBlock implements ITE<CastIronBurnerTileEntity> {
public class CastIronBurnerBlock extends BurnerBlock implements IBE<CastIronBurnerTileEntity> {
public CastIronBurnerBlock(Properties properties) {
super(properties);
}
@ -39,12 +39,12 @@ public class CastIronBurnerBlock extends BurnerBlock implements ITE<CastIronBurn
}
@Override
public Class<CastIronBurnerTileEntity> getTileEntityClass() {
public Class<CastIronBurnerTileEntity> getBlockEntityClass() {
return CastIronBurnerTileEntity.class;
}
@Override
public BlockEntityType<? extends CastIronBurnerTileEntity> getTileEntityType() {
public BlockEntityType<? extends CastIronBurnerTileEntity> getBlockEntityType() {
return SPTiles.CAST_IRON_BURNER.get();
}
}

8
src/main/java/com/teammoeg/steampowered/content/burner/SteelBurnerBlock.java
View file

@ -18,7 +18,7 @@
package com.teammoeg.steampowered.content.burner;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.block.IBE;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -29,7 +29,7 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class SteelBurnerBlock extends BurnerBlock implements ITE<SteelBurnerTileEntity> {
public class SteelBurnerBlock extends BurnerBlock implements IBE<SteelBurnerTileEntity> {
public SteelBurnerBlock(Properties properties) {
super(properties);
}
@ -45,12 +45,12 @@ public class SteelBurnerBlock extends BurnerBlock implements ITE<SteelBurnerTile
}
@Override
public Class<SteelBurnerTileEntity> getTileEntityClass() {
public Class<SteelBurnerTileEntity> getBlockEntityClass() {
return SteelBurnerTileEntity.class;
}
@Override
public BlockEntityType<? extends SteelBurnerTileEntity> getTileEntityType() {
public BlockEntityType<? extends SteelBurnerTileEntity> getBlockEntityType() {
return SPTiles.STEEL_BURNER.get();
}
}

7
src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelBlock.java
View file

@ -18,9 +18,8 @@
package com.teammoeg.steampowered.content.cogwheel;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticTileEntity;
import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.core.BlockPos;
@ -40,7 +39,7 @@ public class MetalCogwheelBlock extends CogWheelBlock {
super(large, properties);
}
public BlockEntityType<? extends SimpleKineticTileEntity> getTileEntityType() {
public BlockEntityType<? extends SimpleKineticBlockEntity> getTileEntityType() {
return SPTiles.METAL_COGWHEEL.get();
}

4
src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelTileEntity.java
View file

@ -18,13 +18,13 @@
package com.teammoeg.steampowered.content.cogwheel;
import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticTileEntity;
import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
public class MetalCogwheelTileEntity extends SimpleKineticTileEntity {
public class MetalCogwheelTileEntity extends SimpleKineticBlockEntity {
public MetalCogwheelTileEntity(BlockEntityType<? extends MetalCogwheelTileEntity> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}

13
src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineBlock.java
View file

@ -20,14 +20,15 @@ package com.teammoeg.steampowered.content.engine;
import java.util.List;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.client.ClientUtils;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.ItemStack;
@ -36,18 +37,18 @@ import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.level.BlockGetter;
public class BronzeSteamEngineBlock extends SteamEngineBlock implements ITE<BronzeSteamEngineTileEntity> {
public class BronzeSteamEngineBlock extends SteamEngineBlock implements IBE<BronzeSteamEngineTileEntity> {
public BronzeSteamEngineBlock(Properties builder) {
super(builder);
}
@Override
public BlockEntityType<? extends BronzeSteamEngineTileEntity> getTileEntityType() {
public BlockEntityType<? extends BronzeSteamEngineTileEntity> getBlockEntityType() {
return SPTiles.BRONZE_STEAM_ENGINE.get();
}
@Override
public Class<BronzeSteamEngineTileEntity> getTileEntityClass() {
public Class<BronzeSteamEngineTileEntity> getBlockEntityClass() {
return BronzeSteamEngineTileEntity.class;
}
@ -59,7 +60,7 @@ public class BronzeSteamEngineBlock extends SteamEngineBlock implements ITE<Bron
if(ClientUtils.hasGoggles())
t.add(new TranslatableComponent("tooltip.steampowered.engine.steamconsume",SPConfig.COMMON.bronzeFlywheelSteamConsumptionPerTick.get()).withStyle(ChatFormatting.GOLD));
}else {
t.add(TooltipHelper.holdShift(Palette.Gray,false));
t.add(TooltipHelper.holdShift(Palette.GRAY,false));
}
super.appendHoverText(i,w,t,f);
}

12
src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineBlock.java
View file

@ -20,9 +20,9 @@ package com.teammoeg.steampowered.content.engine;
import java.util.List;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.client.ClientUtils;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -40,13 +40,13 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class CastIronSteamEngineBlock extends SteamEngineBlock implements ITE<CastIronSteamEngineTileEntity> {
public class CastIronSteamEngineBlock extends SteamEngineBlock implements IBE<CastIronSteamEngineTileEntity> {
public CastIronSteamEngineBlock(Properties builder) {
super(builder);
}
@Override
public BlockEntityType<? extends CastIronSteamEngineTileEntity> getTileEntityType() {
public BlockEntityType<? extends CastIronSteamEngineTileEntity> getBlockEntityType() {
return SPTiles.CAST_IRON_STEAM_ENGINE.get();
}
@Override
@ -57,12 +57,12 @@ public class CastIronSteamEngineBlock extends SteamEngineBlock implements ITE<Ca
if(ClientUtils.hasGoggles())
t.add(new TranslatableComponent("tooltip.steampowered.engine.steamconsume",SPConfig.COMMON.castIronFlywheelSteamConsumptionPerTick.get()).withStyle(ChatFormatting.GOLD));
}else {
t.add(TooltipHelper.holdShift(Palette.Gray,false));
t.add(TooltipHelper.holdShift(Palette.GRAY,false));
}
super.appendHoverText(i,w,t,f);
}
@Override
public Class<CastIronSteamEngineTileEntity> getTileEntityClass() {
public Class<CastIronSteamEngineTileEntity> getBlockEntityClass() {
return CastIronSteamEngineTileEntity.class;
}
}

8
src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineBlock.java
View file

@ -23,11 +23,9 @@ import java.util.Random;
import javax.annotation.Nullable;
import com.jozufozu.flywheel.core.PartialModel;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.AllShapes;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineTileEntity;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineBlock;
import com.teammoeg.steampowered.FluidRegistry;
import com.teammoeg.steampowered.ItemRegistry;
import com.teammoeg.steampowered.client.Particles;
@ -98,7 +96,7 @@ public class SteamEngineBlock extends EngineBlock {
@Nullable
@Override
public PartialModel getFrameModel() {
return AllBlockPartials.FURNACE_GENERATOR_FRAME;
return AllPartialModels.FURNACE_GENERATOR_FRAME;
}
@Override

14
src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineTileEntity.java
View file

@ -18,11 +18,11 @@
package com.teammoeg.steampowered.content.engine;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineTileEntity;
import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineBlock;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineTileEntity;
import com.teammoeg.steampowered.FluidRegistry;
import com.teammoeg.steampowered.SPTags;
import net.minecraft.ChatFormatting;
@ -168,13 +168,13 @@ public abstract class SteamEngineTileEntity extends EngineTileEntity implements
|| FlywheelBlock.getConnection(wheelState) == engineFacing.getOpposite()) {
BlockEntity te = this.level.getBlockEntity(wheelPos);
if (!te.isRemoved()) {
if (te instanceof FlywheelTileEntity) {
if (te instanceof FlywheelBlockEntity) {
if (!FlywheelBlock.isConnected(wheelState)) {
FlywheelBlock.setConnection(this.level, te.getBlockPos(), te.getBlockState(),
engineFacing.getOpposite());
}
this.poweredWheel = (FlywheelTileEntity) te;
this.poweredWheel = (FlywheelBlockEntity) te;
this.refreshWheelSpeed();
}

12
src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineBlock.java
View file

@ -20,9 +20,9 @@ package com.teammoeg.steampowered.content.engine;
import java.util.List;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.item.ItemDescription.Palette;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
import com.teammoeg.steampowered.SPConfig;
import com.teammoeg.steampowered.client.ClientUtils;
import com.teammoeg.steampowered.registrate.SPTiles;
@ -40,13 +40,13 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
public class SteelSteamEngineBlock extends SteamEngineBlock implements ITE<SteelSteamEngineTileEntity> {
public class SteelSteamEngineBlock extends SteamEngineBlock implements IBE<SteelSteamEngineTileEntity> {
public SteelSteamEngineBlock(Properties builder) {
super(builder);
}
@Override
public BlockEntityType<? extends SteelSteamEngineTileEntity> getTileEntityType() {
public BlockEntityType<? extends SteelSteamEngineTileEntity> getBlockEntityType() {
return SPTiles.STEEL_STEAM_ENGINE.get();
}
@Override
@ -57,12 +57,12 @@ public class SteelSteamEngineBlock extends SteamEngineBlock implements ITE<Steel
if(ClientUtils.hasGoggles())
t.add(new TranslatableComponent("tooltip.steampowered.engine.steamconsume",SPConfig.COMMON.steelFlywheelSteamConsumptionPerTick.get()).withStyle(ChatFormatting.GOLD));
}else {
t.add(TooltipHelper.holdShift(Palette.Gray,false));
t.add(TooltipHelper.holdShift(Palette.GRAY,false));
}
super.appendHoverText(i,w,t,f);
}
@Override
public Class<SteelSteamEngineTileEntity> getTileEntityClass() {
public Class<SteelSteamEngineTileEntity> getBlockEntityClass() {
return SteelSteamEngineTileEntity.class;
}
}

6
src/main/java/com/teammoeg/steampowered/content/flywheel/BronzeSteamFlywheelBlock.java
View file

@ -18,8 +18,8 @@
package com.teammoeg.steampowered.content.flywheel;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -29,7 +29,7 @@ public class BronzeSteamFlywheelBlock extends FlywheelBlock {
}
@Override
public BlockEntityType<? extends FlywheelTileEntity> getTileEntityType() {
public BlockEntityType<? extends FlywheelBlockEntity> getBlockEntityType() {
return SPTiles.BRONZE_STEAM_FLYWHEEL.get();
}
}

6
src/main/java/com/teammoeg/steampowered/content/flywheel/CastIronSteamFlywheelBlock.java
View file

@ -18,8 +18,8 @@
package com.teammoeg.steampowered.content.flywheel;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -29,7 +29,7 @@ public class CastIronSteamFlywheelBlock extends FlywheelBlock {
}
@Override
public BlockEntityType<? extends FlywheelTileEntity> getTileEntityType() {
public BlockEntityType<? extends FlywheelBlockEntity> getBlockEntityType() {
return SPTiles.CAST_IRON_STEAM_FLYWHEEL.get();
}
}

6
src/main/java/com/teammoeg/steampowered/content/flywheel/SteelSteamFlywheelBlock.java
View file

@ -18,8 +18,8 @@
package com.teammoeg.steampowered.content.flywheel;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.teammoeg.steampowered.registrate.SPTiles;
import net.minecraft.world.level.block.entity.BlockEntityType;
@ -29,7 +29,7 @@ public class SteelSteamFlywheelBlock extends FlywheelBlock {
}
@Override
public BlockEntityType<? extends FlywheelTileEntity> getTileEntityType() {
public BlockEntityType<? extends FlywheelBlockEntity> getBlockEntityType() {
return SPTiles.STEEL_STEAM_FLYWHEEL.get();
}
}

8
src/main/java/com/teammoeg/steampowered/mixin/FlywheelTileEntityAccess.java
View file

@ -18,16 +18,16 @@
package com.teammoeg.steampowered.mixin;
import com.simibubi.create.foundation.utility.animation.InterpolatedChasingValue;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
@Mixin(FlywheelTileEntity.class)
@Mixin(FlywheelBlockEntity.class)
public interface FlywheelTileEntityAccess {
@Accessor(remap = false)
InterpolatedChasingValue getVisualSpeed();
LerpedFloat getVisualSpeed();
@Accessor(remap = false)
float getAngle();

14
src/main/java/com/teammoeg/steampowered/mixin/MixinFlywheel.java
View file

@ -7,11 +7,11 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineTileEntity;
import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineBlock;
import com.simibubi.create.content.kinetics.flywheel.engine.EngineTileEntity;
import com.teammoeg.steampowered.content.engine.SteamEngineTileEntity;
import net.minecraft.world.level.block.Block;
@ -20,8 +20,8 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
@Mixin(FlywheelTileEntity.class)
public abstract class MixinFlywheel extends GeneratingKineticTileEntity{
@Mixin(FlywheelBlockEntity.class)
public abstract class MixinFlywheel extends GeneratingKineticBlockEntity{
public MixinFlywheel(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}

17
src/main/java/com/teammoeg/steampowered/ponder/SPPonderIndex.java
View file

@ -21,7 +21,8 @@ package com.teammoeg.steampowered.ponder;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.ponder.PonderRegistrationHelper;
import com.simibubi.create.foundation.ponder.PonderTag;
import com.simibubi.create.foundation.ponder.content.KineticsScenes;
import com.simibubi.create.infrastructure.ponder.AllPonderTags;
import com.simibubi.create.infrastructure.ponder.scenes.KineticsScenes;
import com.teammoeg.steampowered.SteamPowered;
import com.teammoeg.steampowered.registrate.SPBlocks;
@ -37,27 +38,27 @@ public class SPPonderIndex {
public static void register() {
CREATE_HELPER.forComponents(SPBlocks.BRONZE_COGWHEEL, SPBlocks.CAST_IRON_COGWHEEL, SPBlocks.STEEL_COGWHEEL)
.addStoryBoard(new ResourceLocation("create", "cog/small"), KineticsScenes::cogAsRelay, PonderTag.KINETIC_RELAYS)
.addStoryBoard(new ResourceLocation("create", "cog/small"), KineticsScenes::cogAsRelay, AllPonderTags.KINETIC_RELAYS)
.addStoryBoard(new ResourceLocation("create", "cog/speedup"), KineticsScenes::cogsSpeedUp);
CREATE_HELPER.forComponents(SPBlocks.BRONZE_LARGE_COGWHEEL, SPBlocks.CAST_IRON_LARGE_COGWHEEL, SPBlocks.STEEL_LARGE_COGWHEEL)
.addStoryBoard(new ResourceLocation("create", "cog/speedup"), KineticsScenes::cogsSpeedUp)
.addStoryBoard(new ResourceLocation("create", "cog/large"), KineticsScenes::largeCogAsRelay, PonderTag.KINETIC_RELAYS);
.addStoryBoard(new ResourceLocation("create", "cog/large"), KineticsScenes::largeCogAsRelay, AllPonderTags.KINETIC_RELAYS);
STEAM_HELPER.forComponents(SPBlocks.BRONZE_STEAM_ENGINE, SPBlocks.CAST_IRON_STEAM_ENGINE, SPBlocks.STEEL_STEAM_ENGINE)
.addStoryBoard("steam_engine", SPScenes::steamEngine, PonderTag.KINETIC_SOURCES, STEAM);
.addStoryBoard("steam_engine", SPScenes::steamEngine, AllPonderTags.KINETIC_SOURCES, STEAM);
STEAM_HELPER.forComponents(SPBlocks.BRONZE_STEAM_ENGINE, SPBlocks.CAST_IRON_STEAM_ENGINE, SPBlocks.STEEL_STEAM_ENGINE)
.addStoryBoard("boiler", SPScenes::steamBoiler, PonderTag.KINETIC_SOURCES, STEAM);
.addStoryBoard("boiler", SPScenes::steamBoiler, AllPonderTags.KINETIC_SOURCES, STEAM);
STEAM_HELPER.forComponents(SPBlocks.BRONZE_BOILER, SPBlocks.BRONZE_BURNER, SPBlocks.CAST_IRON_BURNER, SPBlocks.CAST_IRON_BOILER, SPBlocks.STEEL_BURNER, SPBlocks.STEEL_BOILER)
.addStoryBoard("boiler", SPScenes::steamBoiler, PonderTag.KINETIC_SOURCES, STEAM);
.addStoryBoard("boiler", SPScenes::steamBoiler, AllPonderTags.KINETIC_SOURCES, STEAM);
STEAM_HELPER.forComponents(SPBlocks.BRONZE_FLYWHEEL, SPBlocks.CAST_IRON_FLYWHEEL, SPBlocks.STEEL_FLYWHEEL)
.addStoryBoard("steam_engine", SPScenes::steamFlywheel, PonderTag.KINETIC_SOURCES, STEAM);
.addStoryBoard("steam_engine", SPScenes::steamFlywheel, AllPonderTags.KINETIC_SOURCES, STEAM);
STEAM_HELPER.forComponents(SPBlocks.DYNAMO)
.addStoryBoard("dynamo", SPScenes::dynamo, PonderTag.KINETIC_APPLIANCES, STEAM);
.addStoryBoard("dynamo", SPScenes::dynamo, AllPonderTags.KINETIC_APPLIANCES, STEAM);
}
}

4
src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java
View file

@ -18,8 +18,8 @@
package com.teammoeg.steampowered.ponder;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock.ConnectionState;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock.ConnectionState;
import com.simibubi.create.foundation.ponder.PonderPalette;
import com.simibubi.create.foundation.ponder.SceneBuilder;
import com.simibubi.create.foundation.ponder.SceneBuildingUtil;

44
src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java
View file

@ -19,23 +19,22 @@
package com.teammoeg.steampowered.registrate;
import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.AllTags.axeOnly;
import static com.simibubi.create.AllTags.axeOrPickaxe;
import static com.simibubi.create.AllTags.pickaxeOnly;
import static com.simibubi.create.foundation.data.TagGen.axeOnly;
import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe;
import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
import javax.annotation.Nonnull;
import com.simibubi.create.AllTags;
import com.simibubi.create.Create;
import com.simibubi.create.content.AllSections;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelGenerator;
import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockModel;
import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem;
import com.simibubi.create.foundation.block.BlockStressDefaults;
import com.simibubi.create.content.kinetics.BlockStressDefaults;
import com.simibubi.create.content.kinetics.flywheel.FlywheelGenerator;
import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel;
import com.simibubi.create.content.kinetics.simpleRelays.CogwheelBlockItem;
import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.SharedProperties;
import com.simibubi.create.repack.registrate.util.entry.BlockEntry;
import com.simibubi.create.foundation.data.TagGen;
import com.teammoeg.steampowered.SteamPowered;
import com.teammoeg.steampowered.content.alternator.DynamoBlock;
import com.teammoeg.steampowered.content.boiler.BronzeBoilerBlock;
@ -51,6 +50,7 @@ import com.teammoeg.steampowered.content.engine.SteelSteamEngineBlock;
import com.teammoeg.steampowered.content.flywheel.BronzeSteamFlywheelBlock;
import com.teammoeg.steampowered.content.flywheel.CastIronSteamFlywheelBlock;
import com.teammoeg.steampowered.content.flywheel.SteelSteamFlywheelBlock;
import com.tterrag.registrate.util.entry.BlockEntry;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.Block;
@ -58,7 +58,7 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SoundType;
public class SPBlocks {
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate.get()
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate
.creativeModeTab(() -> SteamPowered.itemGroup);
public static final BlockEntry<BronzeBurnerBlock> BRONZE_BURNER = REGISTRATE.block("bronze_burner", BronzeBurnerBlock::new)
@ -230,18 +230,18 @@ public class SPBlocks {
.register();
public static void register() {
Create.registrate().addToSection(BRONZE_STEAM_ENGINE, AllSections.KINETICS);
Create.registrate().addToSection(CAST_IRON_STEAM_ENGINE, AllSections.KINETICS);
Create.registrate().addToSection(STEEL_STEAM_ENGINE, AllSections.KINETICS);
Create.registrate().addToSection(STEEL_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(STEEL_LARGE_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(CAST_IRON_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(CAST_IRON_LARGE_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(BRONZE_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(BRONZE_LARGE_COGWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(BRONZE_FLYWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(CAST_IRON_FLYWHEEL, AllSections.KINETICS);
Create.registrate().addToSection(STEEL_FLYWHEEL, AllSections.KINETICS);
/*Create.REGISTRATE.addToSection(BRONZE_STEAM_ENGINE, AllSections.KINETICS);
Create.REGISTRATE.addToSection(CAST_IRON_STEAM_ENGINE, AllSections.KINETICS);
Create.REGISTRATE.addToSection(STEEL_STEAM_ENGINE, AllSections.KINETICS);
Create.REGISTRATE.addToSection(STEEL_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(STEEL_LARGE_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(CAST_IRON_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(CAST_IRON_LARGE_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(BRONZE_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(BRONZE_LARGE_COGWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(BRONZE_FLYWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(CAST_IRON_FLYWHEEL, AllSections.KINETICS);
Create.REGISTRATE.addToSection(STEEL_FLYWHEEL, AllSections.KINETICS);*/
}
@Nonnull

4
src/main/java/com/teammoeg/steampowered/registrate/SPItems.java
View file

@ -19,14 +19,14 @@
package com.teammoeg.steampowered.registrate;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.repack.registrate.util.entry.ItemEntry;
import com.teammoeg.steampowered.SteamPowered;
import com.tterrag.registrate.util.entry.ItemEntry;
import net.minecraft.world.item.Item;
public class SPItems {
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate.get()
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate
.creativeModeTab(() -> SteamPowered.itemGroup);
public static final ItemEntry<Item> BRONZE_SHEET =

46
src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java
View file

@ -18,11 +18,10 @@
package com.teammoeg.steampowered.registrate;
import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.repack.registrate.util.entry.BlockEntityEntry;
import com.teammoeg.steampowered.SteamPowered;
import com.teammoeg.steampowered.client.instance.BronzeFlywheelInstance;
import com.teammoeg.steampowered.client.instance.CastIronFlywheelInstance;
@ -41,86 +40,87 @@ import com.teammoeg.steampowered.content.cogwheel.MetalCogwheelTileEntity;
import com.teammoeg.steampowered.content.engine.BronzeSteamEngineTileEntity;
import com.teammoeg.steampowered.content.engine.CastIronSteamEngineTileEntity;
import com.teammoeg.steampowered.content.engine.SteelSteamEngineTileEntity;
import com.tterrag.registrate.util.entry.BlockEntityEntry;
public class SPTiles {
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate.get()
private static final CreateRegistrate REGISTRATE = SteamPowered.registrate
.creativeModeTab(() -> SteamPowered.itemGroup);
public static final BlockEntityEntry<BronzeBurnerTileEntity> BRONZE_BURNER = REGISTRATE
.tileEntity("bronze_burner", BronzeBurnerTileEntity::new)
.blockEntity("bronze_burner", BronzeBurnerTileEntity::new)
.validBlocks(SPBlocks.BRONZE_BURNER)
.register();
public static final BlockEntityEntry<CastIronBurnerTileEntity> CAST_IRON_BURNER = REGISTRATE
.tileEntity("cast_iron_burner", CastIronBurnerTileEntity::new)
.blockEntity("cast_iron_burner", CastIronBurnerTileEntity::new)
.validBlocks(SPBlocks.CAST_IRON_BURNER)
.register();
public static final BlockEntityEntry<SteelBurnerTileEntity> STEEL_BURNER = REGISTRATE
.tileEntity("steel_burner", SteelBurnerTileEntity::new)
.blockEntity("steel_burner", SteelBurnerTileEntity::new)
.validBlocks(SPBlocks.STEEL_BURNER)
.register();
public static final BlockEntityEntry<BronzeBoilerTileEntity> BRONZE_BOILER = REGISTRATE
.tileEntity("bronze_boiler", BronzeBoilerTileEntity::new)
.blockEntity("bronze_boiler", BronzeBoilerTileEntity::new)
.validBlocks(SPBlocks.BRONZE_BOILER)
.register();
public static final BlockEntityEntry<CastIronBoilerTileEntity> CAST_IRON_BOILER = REGISTRATE
.tileEntity("cast_iron_boiler", CastIronBoilerTileEntity::new)
.blockEntity("cast_iron_boiler", CastIronBoilerTileEntity::new)
.validBlocks(SPBlocks.CAST_IRON_BOILER)
.register();
public static final BlockEntityEntry<SteelBoilerTileEntity> STEEL_BOILER = REGISTRATE
.tileEntity("steel_boiler", SteelBoilerTileEntity::new)
.blockEntity("steel_boiler", SteelBoilerTileEntity::new)
.validBlocks(SPBlocks.STEEL_BOILER)
.register();
public static final BlockEntityEntry<BronzeSteamEngineTileEntity> BRONZE_STEAM_ENGINE = REGISTRATE
.tileEntity("bronze_steam_engine", BronzeSteamEngineTileEntity::new)
.blockEntity("bronze_steam_engine", BronzeSteamEngineTileEntity::new)
.validBlocks(SPBlocks.BRONZE_STEAM_ENGINE)
.register();
public static final BlockEntityEntry<CastIronSteamEngineTileEntity> CAST_IRON_STEAM_ENGINE = REGISTRATE
.tileEntity("cast_iron_steam_engine", CastIronSteamEngineTileEntity::new)
.blockEntity("cast_iron_steam_engine", CastIronSteamEngineTileEntity::new)
.validBlocks(SPBlocks.CAST_IRON_STEAM_ENGINE)
.register();
public static final BlockEntityEntry<SteelSteamEngineTileEntity> STEEL_STEAM_ENGINE = REGISTRATE
.tileEntity("steel_steam_engine", SteelSteamEngineTileEntity::new)
.blockEntity("steel_steam_engine", SteelSteamEngineTileEntity::new)
.validBlocks(SPBlocks.STEEL_STEAM_ENGINE)
.register();
public static final BlockEntityEntry<MetalCogwheelTileEntity> METAL_COGWHEEL = REGISTRATE
.tileEntity("metal_cogwheel", MetalCogwheelTileEntity::new)
.blockEntity("metal_cogwheel", MetalCogwheelTileEntity::new)
.instance(() -> SingleRotatingInstance::new)
.validBlocks(SPBlocks.STEEL_COGWHEEL, SPBlocks.STEEL_LARGE_COGWHEEL, SPBlocks.CAST_IRON_COGWHEEL, SPBlocks.CAST_IRON_LARGE_COGWHEEL, SPBlocks.BRONZE_COGWHEEL, SPBlocks.BRONZE_LARGE_COGWHEEL)
.renderer(() -> KineticTileEntityRenderer::new)
.renderer(() -> KineticBlockEntityRenderer::new)
.register();
public static final BlockEntityEntry<DynamoTileEntity> DYNAMO = REGISTRATE
.tileEntity("alternator", DynamoTileEntity::new)
.blockEntity("alternator", DynamoTileEntity::new)
.instance(() -> com.teammoeg.steampowered.content.alternator.DynamoShaftInstance::new)
.validBlocks(SPBlocks.DYNAMO)
.register();
public static final BlockEntityEntry<FlywheelTileEntity> BRONZE_STEAM_FLYWHEEL = REGISTRATE
.tileEntity("bronze_steam_flywheel", FlywheelTileEntity::new)
public static final BlockEntityEntry<FlywheelBlockEntity> BRONZE_STEAM_FLYWHEEL = REGISTRATE
.blockEntity("bronze_steam_flywheel", FlywheelBlockEntity::new)
.instance(() -> BronzeFlywheelInstance::new)
.validBlocks(SPBlocks.BRONZE_FLYWHEEL)
.renderer(() -> BronzeFlywheelRenderer::new)
.register();
public static final BlockEntityEntry<FlywheelTileEntity> CAST_IRON_STEAM_FLYWHEEL = REGISTRATE
.tileEntity("cast_iron_steam_flywheel", FlywheelTileEntity::new)
public static final BlockEntityEntry<FlywheelBlockEntity> CAST_IRON_STEAM_FLYWHEEL = REGISTRATE
.blockEntity("cast_iron_steam_flywheel", FlywheelBlockEntity::new)
.instance(() -> CastIronFlywheelInstance::new)
.validBlocks(SPBlocks.CAST_IRON_FLYWHEEL)
.renderer(() -> CastIronFlywheelRenderer::new)
.register();
public static final BlockEntityEntry<FlywheelTileEntity> STEEL_STEAM_FLYWHEEL = REGISTRATE
.tileEntity("steel_steam_flywheel", FlywheelTileEntity::new)
public static final BlockEntityEntry<FlywheelBlockEntity> STEEL_STEAM_FLYWHEEL = REGISTRATE
.blockEntity("steel_steam_flywheel", FlywheelBlockEntity::new)
.instance(() -> SteelFlywheelInstance::new)
.validBlocks(SPBlocks.STEEL_FLYWHEEL)
.renderer(() -> SteelFlywheelRenderer::new)

4
src/main/resources/META-INF/mods.toml
View file

@ -28,14 +28,14 @@ Expanding Create mod to the Steam Age
[[dependencies.steampowered]]
modId="create"
mandatory=true
versionRange="[v0.4.1,)"
versionRange="[v0.5.1,)"
ordering="NONE"
side="BOTH"
[[dependencies.steampowered]]
modId="flywheel"
mandatory=true
versionRange="[1.18-0.6.2,)"
versionRange="[0.6.9,)"
ordering="AFTER"
side="CLIENT"