maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pipe locking + fixes

Browse Source
This commit is contained in:
DrMangoTea
2023-10-31 21:42:33 +01:00
parent fd4f3d3d85
commit 2bc2a66f9c
994 changed files with 12690 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/drmangotea/createindustry/base/TFMGPipeModelData.java Normal file
View File

@@ -0,0 +1,49 @@
package com.drmangotea.createindustry.base;
import com.simibubi.create.content.fluids.FluidTransportBehaviour;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.BlockState;
import java.util.Arrays;
public class TFMGPipeModelData {
private FluidTransportBehaviour.AttachmentTypes[] attachments;
private boolean encased;
private BakedModel bracket;
public TFMGPipeModelData() {
attachments = new FluidTransportBehaviour.AttachmentTypes[6];
Arrays.fill(attachments, FluidTransportBehaviour.AttachmentTypes.NONE);
}
public void putBracket(BlockState state) {
if (state != null) {
this.bracket = Minecraft.getInstance()
.getBlockRenderer()
.getBlockModel(state);
}
}
public BakedModel getBracket() {
return bracket;
}
public void putAttachment(Direction face, FluidTransportBehaviour.AttachmentTypes rim) {
attachments[face.get3DDataValue()] = rim;
}
public FluidTransportBehaviour.AttachmentTypes getAttachment(Direction face) {
return attachments[face.get3DDataValue()];
}
public void setEncased(boolean encased) {
this.encased = encased;
}
public boolean isEncased() {
return encased;
}
}

76
src/main/java/com/drmangotea/createindustry/blocks/concrete/asphalt/AsphaltFluid.java Normal file
View File

@@ -0,0 +1,76 @@
package com.drmangotea.createindustry.blocks.concrete.asphalt;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.util.RandomSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import net.minecraftforge.fluids.ForgeFlowingFluid;
public class AsphaltFluid extends ForgeFlowingFluid {
protected AsphaltFluid(Properties properties) {
super(properties);
}
@Override
public boolean isSource(FluidState p_76140_) {
return true;
}
@Override
public int getAmount(FluidState p_164509_) {
return 8;
}
@Override
public void randomTick(Level level, BlockPos pos, FluidState p_230574_, RandomSource randomSource) {
int random = randomSource.nextInt(7) ;
if(random==2) {
level.setBlock(pos, TFMGBlocks.ASPHALT.get().defaultBlockState(), 3);
}
}
protected boolean isRandomlyTicking() {
return true;
}
//
public static class Flowing extends AsphaltFluid {
public Flowing(Properties properties) {
super(properties);
}
protected void createFluidStateDefinition(StateDefinition.Builder<Fluid, FluidState> p_76260_) {
super.createFluidStateDefinition(p_76260_);
p_76260_.add(LEVEL);
}
public int getAmount(FluidState p_76264_) {
return p_76264_.getValue(LEVEL);
}
public boolean isSource(FluidState p_76262_) {
return false;
}
}
public static class Source extends AsphaltFluid {
public Source(Properties properties) {
super(properties);
}
public int getAmount(FluidState p_76269_) {
return 8;
}
public boolean isSource(FluidState p_76267_) {
return true;
}
}
}

1
src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeInstance.java
View File

@@ -209,6 +209,7 @@ public class AirIntakeInstance extends KineticBlockEntityInstance<com.drmangotea
}
if(!blockEntity.isController) {
chassisMedium.setEmptyTransform();
fan_medium.setEmptyTransform();
fan_large.setEmptyTransform();

26
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java
View File

@@ -89,6 +89,10 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
.withMaxStackSize(64);
itemCapability = LazyOptional.of(() -> new CombinedInvWrapper(inputInventory,fuelInventory));
tank1.getPrimaryHandler().setCapacity(8000);
tank2.getPrimaryHandler().setCapacity(8000);
}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
@@ -114,10 +118,10 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
if(speedModifier!=0) {
fuelEfficiency = 1000 * speedModifier;
fuelEfficiency = 400 * speedModifier;
speedModifier = (blastFurnaceLevel/2);
}else {
fuelEfficiency = 1000;
fuelEfficiency = 400;
speedModifier = 1;
}
@@ -157,7 +161,8 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
if(timer == -1&&
(tank1.getPrimaryHandler().getFluidAmount()+recipe.getFluidResults().get(0).getAmount())<=tank1.getPrimaryHandler().getCapacity()&&
(tank2.getPrimaryHandler().getFluidAmount()+recipe.getFluidResults().get(1).getAmount())<=tank2.getPrimaryHandler().getCapacity()&&
type != BlastFurnaceType.INVALID
type != BlastFurnaceType.INVALID&&
!fuelInventory.isEmpty()
) {
timer= (int) (recipe.getProcessingDuration()/speedModifier);
@@ -179,10 +184,10 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
acceptInsertedItems();
if(recipe!=null)
if(fuelInventory.isEmpty()){
timer= (int) (recipe.getProcessingDuration()/speedModifier);
}
// if(recipe!=null)
// if(!fuelInventory.isEmpty()){
// timer= (int) (recipe.getProcessingDuration()/speedModifier);
// }
if(type != BlastFurnaceType.INVALID&&timer>0&&
@@ -331,6 +336,9 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
@Override
@SuppressWarnings("removal")
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
// Lang.translate("goggles.blast_furnace.height", timer)
// .style(ChatFormatting.LIGHT_PURPLE)
// .forGoggles(tooltip, 1);
if(type == BlastFurnaceType.INVALID){
Lang.translate("goggles.blast_furnace.invalid")
.style(ChatFormatting.RED)
@@ -380,10 +388,6 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
.style(ChatFormatting.AQUA)
.forGoggles(tooltip, 1);
Lang.translate("goggles.blast_furnace.height", timer)
.style(ChatFormatting.LIGHT_PURPLE)
.forGoggles(tooltip, 1);
}

4
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
public class MoltenMetalBlockEntity extends SmartBlockEntity {
public int discardTimer =0;
public int discardTimer;
public MoltenMetalBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
@@ -25,7 +25,7 @@ public class MoltenMetalBlockEntity extends SmartBlockEntity {
super.tick();
discardTimer-- ;
if(discardTimer == 0)
if(Create.RANDOM.nextInt(25)==5)
// if(Create.RANDOM.nextInt(25)==5)
level.setBlock(getBlockPos(), Blocks.AIR.defaultBlockState(),3);
}

5
src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationOutputBlockEntity.java
View File

@@ -2,6 +2,7 @@ package com.drmangotea.createindustry.blocks.machines.oil_processing.distillatio
import com.drmangotea.createindustry.CreateTFMG;
import com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillery.DistilleryOutputBlockEntity;
import com.drmangotea.createindustry.recipes.distillation.ItemlessRecipe;
import com.drmangotea.createindustry.recipes.distillation.AdvancedDistillationRecipe;
@@ -246,8 +247,8 @@ if(fluidInRecipe2!=null)
return;
if(controller.towerLevel>=12) {
speed = 1;
} else speed=3;
speed = 3;
} else speed=6;
if(processTimer<speed){
processTimer++;

25
src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/IndustrialPipeBlock.java Normal file
View File

@@ -0,0 +1,25 @@
package com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillation_tower;
import com.drmangotea.createindustry.registry.TFMGShapes;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
public class IndustrialPipeBlock extends Block {
public IndustrialPipeBlock(Properties p_49795_) {
super(p_49795_);
}
@Override
public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return TFMGShapes.INDUSTRIAL_PIPE;
}
}

2
src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/crank/PumpjackCrankBlock.java
View File

@@ -36,7 +36,7 @@ public class PumpjackCrankBlock extends HorizontalDirectionalBlock implements IB
}
@Override
public RenderShape getRenderShape(BlockState pState) {
return RenderShape.ENTITYBLOCK_ANIMATED;
return RenderShape.MODEL;
}
@Override
public BlockEntityType<? extends PumpjackCrankBlockEntity> getBlockEntityType() {

41
src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/crank/PumpjackCrankRenderer.java
View File

@@ -53,9 +53,6 @@ public class PumpjackCrankRenderer extends KineticBlockEntityRenderer {
private void renderCrank(KineticBlockEntity te, PoseStack ms, int light, BlockState blockState, float angle,
VertexConsumer vb) {
/**
* check
*/
SuperByteBuffer hammer = CachedBufferer.block(blockState);
//kineticRotationTransform(hammer, te, getRotationAxisOf(te), AngleHelper.rad(angle), light);
@@ -73,28 +70,28 @@ public class PumpjackCrankRenderer extends KineticBlockEntityRenderer {
float dialPivot = 5.75f / 16;
SuperByteBuffer crank = CachedBufferer.partialFacing(TFMGPartialModels.PUMPJACK_CRANK, blockState,blockState.getValue(FACING));
CachedBufferer.partialFacing(TFMGPartialModels.PUMPJACK_CRANK_BLOCK, blockState,blockState.getValue(FACING))
.translate(-0.5, -0.5, -0.5)
.light(light)
.renderInto(ms,vb);
crank
.translate(-0.5, -0.75, -0.5)
.translate(-0.5, -0.5, -0.5)
.centre()
.rotate(be.direction.getCounterClockWise(), -AngleHelper.rad(be.angle))
.translate(0, -.25, 0)
.rotate(be.getBlockState().getValue(FACING).getCounterClockWise(), -AngleHelper.rad(be.angle))
.translate(0, .25, 0)
.unCentre()
.light(light)
.translateY(0.5);
.light(light);
crank.renderInto(ms,vb);
if (be.direction == Direction.NORTH){
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CRANK_BLOCK, blockState)
// .rotateY(d.toYRot())
.unCentre()
.light(light)
.renderInto(ms, vb);
if(be.isValid()) {
@@ -114,11 +111,7 @@ public class PumpjackCrankRenderer extends KineticBlockEntityRenderer {
}
}
if(be.direction == Direction.EAST) {
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CRANK_BLOCK, blockState)
.rotateY(270)
.unCentre()
.light(light)
.renderInto(ms, vb);
if(be.isValid()) {
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CONNECTOR, blockState)
@@ -137,11 +130,7 @@ public class PumpjackCrankRenderer extends KineticBlockEntityRenderer {
}
}
if(be.direction == Direction.SOUTH) {
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CRANK_BLOCK, blockState)
.rotateY(180)
.unCentre()
.light(light)
.renderInto(ms, vb);
if(be.isValid()) {
@@ -161,11 +150,7 @@ public class PumpjackCrankRenderer extends KineticBlockEntityRenderer {
}
}
if(be.direction == Direction.WEST) {
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CRANK_BLOCK, blockState)
.rotateY(90)
.unCentre()
.light(light)
.renderInto(ms, vb);
if(be.isValid()) {
CachedBufferer.partial(TFMGPartialModels.PUMPJACK_CONNECTOR, blockState)

30
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/LockablePipeBlockEntity.java
View File

@@ -1,15 +1,24 @@
package com.drmangotea.createindustry.blocks.pipes.normal;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.content.fluids.FluidTransportBehaviour;
import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import java.util.Map;
public class LockablePipeBlockEntity extends FluidPipeBlockEntity {
@@ -20,9 +29,26 @@ public class LockablePipeBlockEntity extends FluidPipeBlockEntity {
}
public void toggleLock(Player player){
level.playSound(player, getBlockPos(), SoundEvents.ANVIL_PLACE, SoundSource.BLOCKS, 0.3f,0.5f);
level.playSound(player, getBlockPos(), SoundEvents.COPPER_STEP, SoundSource.BLOCKS, 0.3f,0.5f);
locked = !locked;
if(locked)
return;
BlockState newState;
Level world = level;
BlockPos pos = getBlockPos();
FluidTransportBehaviour.cacheFlows(world, pos);
newState = updatePipe(world, pos, getBlockState()).setValue(BlockStateProperties.WATERLOGGED, getBlockState().getValue(BlockStateProperties.WATERLOGGED));
world.setBlock(pos, newState, 3);
FluidTransportBehaviour.loadFlows(world, pos);
}
public BlockState updatePipe(LevelAccessor world, BlockPos pos, BlockState state) {
Direction side = Direction.UP;
Map<Direction, BooleanProperty> facingToPropertyMap = FluidPipeBlock.PROPERTY_BY_DIRECTION;
return AllBlocks.FLUID_PIPE.get()
.updateBlockState(state.getBlock().defaultBlockState()
.setValue(facingToPropertyMap.get(side), true)
.setValue(facingToPropertyMap.get(side.getOpposite()), true), side, null, world, pos);
}
@Override

20
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/aluminum/AluminumPipeAttachmentModel.java
View File

@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
public class AluminumPipeAttachmentModel extends BakedModelWrapperWithData {
private static final ModelProperty<PipeModelData> PIPE_PROPERTY = new ModelProperty<>();
@@ -42,8 +44,24 @@ public class AluminumPipeAttachmentModel extends BakedModelWrapperWithData {
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());

20
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/brass/BrassPipeAttachmentModel.java
View File

@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
public class BrassPipeAttachmentModel extends BakedModelWrapperWithData {
private static final ModelProperty<PipeModelData> PIPE_PROPERTY = new ModelProperty<>();
@@ -42,8 +44,24 @@ public class BrassPipeAttachmentModel extends BakedModelWrapperWithData {
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());

20
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/cast_iron/CastIronPipeAttachmentModel.java
View File

@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
public class CastIronPipeAttachmentModel extends BakedModelWrapperWithData {
private static final ModelProperty<PipeModelData> PIPE_PROPERTY = new ModelProperty<>();
@@ -42,8 +44,24 @@ public class CastIronPipeAttachmentModel extends BakedModelWrapperWithData {
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());

20
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/plastic/PlasticPipeAttachmentModel.java
View File

@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
public class PlasticPipeAttachmentModel extends BakedModelWrapperWithData {
private static final ModelProperty<PipeModelData> PIPE_PROPERTY = new ModelProperty<>();
@@ -42,8 +44,24 @@ public class PlasticPipeAttachmentModel extends BakedModelWrapperWithData {
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());

25
src/main/java/com/drmangotea/createindustry/blocks/pipes/normal/steel/SteelPipeAttachmentModel.java
View File

@@ -1,5 +1,6 @@
package com.drmangotea.createindustry.blocks.pipes.normal.steel;
import com.drmangotea.createindustry.blocks.pipes.normal.LockablePipeBlockEntity;
import com.drmangotea.createindustry.registry.TFMGPartialModels;
import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
import com.simibubi.create.content.fluids.FluidTransportBehaviour;
@@ -25,6 +26,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.locks.Lock;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
public class SteelPipeAttachmentModel extends BakedModelWrapperWithData {
@@ -42,8 +46,25 @@ public class SteelPipeAttachmentModel extends BakedModelWrapperWithData {
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getBlock() instanceof FluidPipeBlock)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());
@@ -92,7 +113,7 @@ public class SteelPipeAttachmentModel extends BakedModelWrapperWithData {
.getQuads(state, side, rand, data, renderType));
}
private static class PipeModelData {
public class PipeModelData {
private FluidTransportBehaviour.AttachmentTypes[] attachments;
private boolean encased;
private BakedModel bracket;

13
src/main/java/com/drmangotea/createindustry/items/ScrewdriverItem.java
View File

@@ -2,7 +2,9 @@ package com.drmangotea.createindustry.items;
import com.drmangotea.createindustry.blocks.pipes.normal.LockablePipeBlockEntity;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionResult;
@@ -10,6 +12,9 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import java.util.Map;
public class ScrewdriverItem extends Item {
@@ -38,9 +43,13 @@ public class ScrewdriverItem extends Item {
level.getBlockState(positionClicked).is(TFMGBlocks.ALUMINUM_PIPE.get())||
level.getBlockState(positionClicked).is(TFMGBlocks.PLASTIC_PIPE.get())
) {
level.playSound(player, positionClicked, SoundEvents.ANVIL_PLACE, SoundSource.BLOCKS, 0.3f,0.5f);
//level.playSound(player, positionClicked, SoundEvents.COPPER_STEP, SoundSource.BLOCKS, 0.3f,0.5f);
((LockablePipeBlockEntity)level.getBlockEntity(positionClicked)).toggleLock(player);
// Direction side = Direction.UP;
// Map<Direction, BooleanProperty> facingToPropertyMap = FluidPipeBlock.PROPERTY_BY_DIRECTION;
// ((FluidPipeBlock)level.getBlockState(positionClicked).getBlock()).updateBlockState(TFMGBlocks.ALUMINUM_PIPE.getDefaultState()
// .setValue(facingToPropertyMap.get(side), true)
// .setValue(facingToPropertyMap.get(side.getOpposite()), true), side, null, level, positionClicked);;
}

15
src/main/java/com/drmangotea/createindustry/mixins/FluidPipeBlockMixin.java
View File

@@ -262,7 +262,6 @@ public class FluidPipeBlockMixin extends PipeBlock implements SimpleWaterloggedB
@Overwrite( remap = false)
public BlockState updateBlockState(BlockState state, Direction preferredDirection, @Nullable Direction ignore,
BlockAndTintGetter world, BlockPos pos) {
CreateTFMG.LOGGER.debug("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (bracket != null && bracket.isBracketPresent())
return state;
@@ -273,16 +272,24 @@ public class FluidPipeBlockMixin extends PipeBlock implements SimpleWaterloggedB
.filter(prevState::getValue)
.count();
// Update sides that are not ignored
for (Direction d : Iterate.directions)
if (d != ignore) {
boolean shouldConnect = canConnectTo(world, pos.relative(d), world.getBlockState(pos.relative(d)), d);
if(world.getBlockEntity(pos.relative(d)) instanceof LockablePipeBlockEntity)
if(((LockablePipeBlockEntity)world.getBlockEntity(pos.relative(d))).locked) {
if(world.getBlockEntity(pos.relative(d)) instanceof LockablePipeBlockEntity) {
if (((LockablePipeBlockEntity) world.getBlockEntity(pos.relative(d))).locked) {
shouldConnect = false;
CreateTFMG.LOGGER.debug("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
if(world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()))){
shouldConnect =true;
}
}
}
state = state.setValue(PROPERTY_BY_DIRECTION.get(d), shouldConnect);
}

130
src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java Normal file
View File

@@ -0,0 +1,130 @@
package com.drmangotea.createindustry.mixins;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.drmangotea.createindustry.base.TFMGPipeModelData;
import com.drmangotea.createindustry.blocks.pipes.normal.plastic.PlasticPipeAttachmentModel;
import com.simibubi.create.content.fluids.FluidTransportBehaviour;
import com.simibubi.create.content.fluids.PipeAttachmentModel;
import org.jetbrains.annotations.NotNull;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes;
import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes.ComponentPartials;
import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.model.BakedModelWrapperWithData;
import com.simibubi.create.foundation.utility.Iterate;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.RandomSource;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.client.ChunkRenderTypeSet;
import net.minecraftforge.client.model.data.ModelData;
import net.minecraftforge.client.model.data.ModelData.Builder;
import net.minecraftforge.client.model.data.ModelProperty;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION;
@Mixin(PipeAttachmentModel.class)
public class PipeAttachmentModelMixin extends BakedModelWrapperWithData {
private static final ModelProperty<TFMGPipeModelData> PIPE_PROPERTY = new ModelProperty<>();
public PipeAttachmentModelMixin(BakedModel template) {
super(template);
}
/**
* @author DrMangoTea
* @reason locked pipes
*/
@Overwrite( remap = false)
protected ModelData.Builder gatherModelData(ModelData.Builder builder, BlockAndTintGetter world, BlockPos pos, BlockState state,
ModelData blockEntityData) {
TFMGPipeModelData data = new TFMGPipeModelData();
FluidTransportBehaviour transport = BlockEntityBehaviour.get(world, pos, FluidTransportBehaviour.TYPE);
BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE);
if (transport != null)
for (Direction d : Iterate.directions) {
boolean shouldConnect = true;
if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) {
if(d.getAxis().isHorizontal())
shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite()));
}
data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d));
if(!shouldConnect)
if(state.getValue(PROPERTY_BY_DIRECTION.get(d)))
data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM);
}
if (bracket != null)
data.putBracket(bracket.getBracket());
data.setEncased(FluidPipeBlock.shouldDrawCasing(world, pos, state));
return builder.with(PIPE_PROPERTY, data);
}
@SuppressWarnings("removal")
@Override
public ChunkRenderTypeSet getRenderTypes(@NotNull BlockState state, @NotNull RandomSource rand, @NotNull ModelData data) {
ChunkRenderTypeSet set = super.getRenderTypes(state, rand, data);
if (set.isEmpty()) {
return ItemBlockRenderTypes.getRenderLayers(state);
}
return set;
}
@Override
public List<BakedQuad> getQuads(BlockState state, Direction side, RandomSource rand, ModelData data, RenderType renderType) {
List<BakedQuad> quads = super.getQuads(state, side, rand, data, renderType);
if (data.has(PIPE_PROPERTY)) {
TFMGPipeModelData pipeData = data.get(PIPE_PROPERTY);
quads = new ArrayList<>(quads);
addQuads(quads, state, side, rand, data, pipeData, renderType);
}
return quads;
}
private void addQuads(List<BakedQuad> quads, BlockState state, Direction side, RandomSource rand, ModelData data,
TFMGPipeModelData pipeData, RenderType renderType) {
BakedModel bracket = pipeData.getBracket();
if (bracket != null)
quads.addAll(bracket.getQuads(state, side, rand, data, renderType));
for (Direction d : Iterate.directions) {
AttachmentTypes type = pipeData.getAttachment(d);
for (ComponentPartials partial : type.partials) {
quads.addAll(AllPartialModels.PIPE_ATTACHMENTS.get(partial)
.get(d)
.get()
.getQuads(state, side, rand, data, renderType));
}
}
if (pipeData.isEncased())
quads.addAll(AllPartialModels.FLUID_PIPE_CASING.get()
.getQuads(state, side, rand, data, renderType));
}
}

149
src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java
View File

@@ -7,6 +7,7 @@ import com.drmangotea.createindustry.base.TFMGVanillaBlockStates;
import com.drmangotea.createindustry.blocks.concrete.formwork.FormWorkBlock;
import com.drmangotea.createindustry.blocks.concrete.formwork.FormWorkGenerator;
import com.drmangotea.createindustry.blocks.concrete.formwork.rebar.RebarFormWorkBlock;
import com.drmangotea.createindustry.blocks.decoration.TFMGGravityBlock;
import com.drmangotea.createindustry.blocks.decoration.TrussBlock;
import com.drmangotea.createindustry.blocks.decoration.doors.TFMGSlidingDoorBlock;
import com.drmangotea.createindustry.blocks.decoration.flywheels.TFMGFlywheelBlock;
@@ -26,6 +27,7 @@ import com.drmangotea.createindustry.blocks.engines.small.turbine.TurbineEngineB
import com.drmangotea.createindustry.blocks.machines.exhaust.ExhaustBlock;
import com.drmangotea.createindustry.blocks.machines.flarestack.FlarestackBlock;
import com.drmangotea.createindustry.blocks.machines.flarestack.FlarestackGenerator;
import com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillation_tower.IndustrialPipeBlock;
import com.drmangotea.createindustry.blocks.pipes.normal.aluminum.AluminumPipeAttachmentModel;
import com.drmangotea.createindustry.blocks.pipes.normal.aluminum.AluminumPipeBlock;
import com.drmangotea.createindustry.blocks.pipes.normal.aluminum.EncasedAluminumPipeBlock;
@@ -71,10 +73,7 @@ import com.drmangotea.createindustry.blocks.tanks.SteelFluidTankModel;
import com.drmangotea.createindustry.blocks.tanks.SteelTankBlock;
import com.drmangotea.createindustry.blocks.tanks.SteelTankGenerator;
import com.drmangotea.createindustry.blocks.tanks.SteelTankItem;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllSpriteShifts;
import com.simibubi.create.AllTags;
import com.simibubi.create.Create;
import com.simibubi.create.*;
import com.simibubi.create.content.decoration.MetalLadderBlock;
import com.simibubi.create.content.decoration.MetalScaffoldingBlock;
import com.simibubi.create.content.decoration.encasing.CasingBlock;
@@ -87,6 +86,7 @@ import com.simibubi.create.content.kinetics.BlockStressDefaults;
import com.simibubi.create.content.processing.AssemblyOperatorBlockItem;
import com.simibubi.create.foundation.data.*;
import com.simibubi.create.foundation.utility.Couple;
import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables;
import com.tterrag.registrate.util.DataIngredient;
import com.tterrag.registrate.util.entry.BlockEntry;
import net.minecraft.client.renderer.RenderType;
@@ -99,6 +99,9 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootPool;
import net.minecraft.world.level.storage.loot.entries.LootItem;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.common.Tags;
import net.minecraftforge.registries.RegistryObject;
@@ -124,7 +127,7 @@ public class TFMGBlocks {
.properties(p -> p.color(MaterialColor.TERRACOTTA_GREEN))
.properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly())
.blockstate(simpleCubeAll("napalm_bomb"))
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.item()
.build()
.lang("Napalm Bomb")
@@ -186,6 +189,15 @@ public class TFMGBlocks {
.lang("Aluminum Truss")
.register();
public static final BlockEntry<Block> HARDENED_PLANKS = REGISTRATE.block("hardened_planks", Block::new)
.initialProperties(() -> Blocks.OAK_PLANKS)
.properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN))
.transform(axeOnly())
.item()
.build()
.lang("Hardened Planks")
.register();
public static final BlockEntry<Block> CAUTION_BLOCK = REGISTRATE.block("caution_block", Block::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.COLOR_YELLOW))
@@ -195,6 +207,7 @@ public class TFMGBlocks {
.lang("Caution Block")
.register();
public static final BlockEntry<Block> RED_CAUTION_BLOCK = REGISTRATE.block("red_caution_block", Block::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.COLOR_RED))
@@ -205,6 +218,32 @@ public class TFMGBlocks {
.register();
public static final BlockEntry<Block> ASPHALT = REGISTRATE.block("asphalt", Block::new)
.initialProperties(() -> Blocks.STONE)
.properties(p -> p.color(MaterialColor.COLOR_BLACK))
.transform(pickaxeOnly())
.item()
.build()
.lang("Asphalt")
.register();
public static final BlockEntry<Block> SULFUR = REGISTRATE.block("sulfur", Block::new)
.initialProperties(() -> Blocks.CALCITE)
.properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW))
.transform(pickaxeOnly())
.item()
.build()
.lang("Sulfur")
.register();
public static final BlockEntry<Block> LIGNITE = REGISTRATE.block("lignite", Block::new)
.initialProperties(() -> Blocks.CALCITE)
.properties(p -> p.color(MaterialColor.COLOR_BROWN))
.transform(pickaxeOnly())
.item()
.build()
.lang("Lignite")
.register();
public static final BlockEntry<MetalScaffoldingBlock> STEEL_SCAFFOLD =
REGISTRATE.block("steel_scaffolding", MetalScaffoldingBlock::new)
.properties(p -> p
@@ -293,6 +332,48 @@ public class TFMGBlocks {
.lang("Factory Floor Slab")
.register();
public static final BlockEntry<TFMGGravityBlock> LIMESAND = REGISTRATE.block("limesand", TFMGGravityBlock::new)
.initialProperties(() -> Blocks.SAND)
.properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW))
//.transform(pickaxeOnly())
.blockstate(simpleCubeAll("limesand"))
// .tag(Tags.Blocks)
.item()
.build()
.lang("Limesand")
.register();
public static final BlockEntry<TFMGGravityBlock> CEMENT = REGISTRATE.block("cement", TFMGGravityBlock::new)
.initialProperties(() -> Blocks.SAND)
.properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
//.transform(pickaxeOnly())
.blockstate(simpleCubeAll("cement"))
// .tag(Tags.Blocks)
.item()
.build()
.lang("Cement")
.register();
public static final BlockEntry<Block> FIRECLAY = REGISTRATE.block("fireclay", Block::new)
.initialProperties(() -> Blocks.CLAY)
.properties(p -> p.color(MaterialColor.TERRACOTTA_RED))
//.transform(pickaxeOnly())
.blockstate(simpleCubeAll("fireclay"))
.loot((p, b) -> p.add(b, RegistrateBlockLootTables.createSingleItemTable(TFMGItems.FIRECLAY_BALL.get())
.withPool(RegistrateBlockLootTables.applyExplosionCondition(TFMGItems.FIRECLAY_BALL.get(), LootPool.lootPool()
.add(LootItem.lootTableItem(TFMGItems.FIRECLAY_BALL.get()))))
.withPool(RegistrateBlockLootTables.applyExplosionCondition(TFMGItems.FIRECLAY_BALL.get(), LootPool.lootPool()
.add(LootItem.lootTableItem(TFMGItems.FIRECLAY_BALL.get()))))
.withPool(RegistrateBlockLootTables.applyExplosionCondition(TFMGItems.FIRECLAY_BALL.get(), LootPool.lootPool()
.add(LootItem.lootTableItem(TFMGItems.FIRECLAY_BALL.get()))))))
// .tag(Tags.Blocks)
.item()
.build()
.lang("Fireclay")
.register();
//-----------------------MACHINES---------------------------//
public static final BlockEntry<FormWorkBlock> FORMWORK_BLOCK =
REGISTRATE.block("formwork_block", FormWorkBlock::new)
@@ -303,7 +384,7 @@ public class TFMGBlocks {
.blockstate(new FormWorkGenerator()::generate)
.transform(axeOnly())
.item()
.build()
.transform(customItemModel())
.register();
public static final BlockEntry<RebarFormWorkBlock> REBAR_FORMWORK_BLOCK =
@@ -315,7 +396,7 @@ public class TFMGBlocks {
.blockstate(new FormWorkGenerator()::generate)
.transform(axeOnly())
.item()
.build()
.transform(customItemModel())
.register();
@@ -384,6 +465,7 @@ public class TFMGBlocks {
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.color(MaterialColor.STONE))
.properties(BlockBehaviour.Properties::noOcclusion)
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.transform(axeOrPickaxe())
.item(AssemblyOperatorBlockItem::new)
.build()
@@ -391,6 +473,7 @@ public class TFMGBlocks {
public static final BlockEntry<DistilleryControllerBlock> CAST_IRON_DISTILLATION_CONTROLLER =
REGISTRATE.block("cast_iron_distillation_controller", DistilleryControllerBlock::new)
.initialProperties(SharedProperties::copperMetal)
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.item()
.build()
.register();
@@ -399,6 +482,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
REGISTRATE.block("steel_distillation_output", DistillationOutputBlock::new)
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.color(MaterialColor.STONE))
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(axeOrPickaxe())
.item(AssemblyOperatorBlockItem::new)
@@ -407,14 +491,16 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
public static final BlockEntry<DistillationControllerBlock> STEEL_DISTILLATION_CONTROLLER =
REGISTRATE.block("steel_distillation_controller", DistillationControllerBlock::new)
.initialProperties(SharedProperties::copperMetal)
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.item()
.build()
.register();
public static final BlockEntry<Block> INDUSTRIAL_PIPE = REGISTRATE.block("industrial_pipe", Block::new)
public static final BlockEntry<IndustrialPipeBlock> INDUSTRIAL_PIPE = REGISTRATE.block("industrial_pipe", IndustrialPipeBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
.properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly())
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
.item()
.build()
.lang("Industrial Pipe")
@@ -431,6 +517,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
.strength(4.5F))
.transform(axeOrPickaxe())
.transform(BlockStressDefaults.setImpact(4.0))
.blockstate(BlockStateGen.directionalBlockProvider(true))
.item()
.build()
.register();
@@ -441,6 +528,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
.properties(p -> p
.strength(4.5F))
.properties(BlockBehaviour.Properties::noOcclusion)
.blockstate(BlockStateGen.horizontalBlockProvider(true))
.transform(axeOrPickaxe())
.item()
.build()
@@ -449,6 +537,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
REGISTRATE.block("pumpjack_base", PumpjackBaseBlock::new)
.initialProperties(SharedProperties::copperMetal)
.properties(BlockBehaviour.Properties::noOcclusion)
.blockstate(BlockStateGen.horizontalBlockProvider(true))
.item()
.build()
.register();
@@ -457,6 +546,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
REGISTRATE.block("pumpjack_hammer_holder", PumpjackHammerHolderBlock::new)
.initialProperties(SharedProperties::copperMetal)
.properties(BlockBehaviour.Properties::noOcclusion)
.blockstate(BlockStateGen.horizontalBlockProvider(true))
.item()
.build()
.register();
@@ -508,6 +598,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
public static final BlockEntry<CastingBasinBlock> CASTING_BASIN = REGISTRATE.block("casting_basin", CastingBasinBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.TERRACOTTA_BLACK))
.properties(BlockBehaviour.Properties::noOcclusion)
.properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly())
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
@@ -520,6 +611,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
public static final BlockEntry<CastingSpoutBlock> CASTING_SPOUT = REGISTRATE.block("casting_spout", CastingSpoutBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.TERRACOTTA_BLACK))
.properties(BlockBehaviour.Properties::noOcclusion)
.properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly())
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
@@ -607,6 +699,19 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
.build()
.lang("Block of Aluminum")
.register();
public static final BlockEntry<Block> PLASTIC_BLOCK = REGISTRATE.block("plastic_block", Block::new)
.initialProperties(() -> Blocks.QUARTZ_BLOCK)
.properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
.properties(p -> p.requiresCorrectToolForDrops())
.transform(pickaxeOnly())
.blockstate(simpleCubeAll("plastic_block"))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/plastic"))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Plastic")
.register();
//public static final BlockEntry<Block> LEAD_BLOCK = REGISTRATE.block("lead_block", Block::new)
// .initialProperties(() -> Blocks.IRON_BLOCK)
@@ -643,20 +748,20 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
.lang("Block of Coal Coke")
.register();
//sheetmetals
public static final BlockEntry<Block> STEEL_SHEETMETAL = REGISTRATE.block("steel_sheetmetal", Block::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
.properties(p -> p.requiresCorrectToolForDrops())
.onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.STEEL_SHEETMETAL)))
.onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.STEEL_SHEETMETAL)))
.transform(pickaxeOnly())
.blockstate(simpleCubeAll("steel_sheetmetal"))
.tag(BlockTags.NEEDS_IRON_TOOL)
.item()
.build()
.lang("Steel Sheetmetal")
.register();
// //sheetmetals
// public static final BlockEntry<Block> STEEL_SHEETMETAL = REGISTRATE.block("steel_sheetmetal", Block::new)
// .initialProperties(() -> Blocks.IRON_BLOCK)
// .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
// .properties(p -> p.requiresCorrectToolForDrops())
// .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.STEEL_SHEETMETAL)))
// .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.STEEL_SHEETMETAL)))
// .transform(pickaxeOnly())
// .blockstate(simpleCubeAll("steel_sheetmetal"))
// .tag(BlockTags.NEEDS_IRON_TOOL)
// .item()
// .build()
// .lang("Steel Sheetmetal")
// .register();
//
public static final BlockEntry<TFMGSlidingDoorBlock> HEAVY_CASING_DOOR =

51
src/main/java/com/drmangotea/createindustry/registry/TFMGFluids.java
View File

@@ -6,6 +6,7 @@ package com.drmangotea.createindustry.registry;
import com.drmangotea.createindustry.CreateTFMG;
import com.drmangotea.createindustry.blocks.concrete.ConcreteFluid;
import com.drmangotea.createindustry.blocks.concrete.ConcreteFluidType;
import com.drmangotea.createindustry.blocks.concrete.asphalt.AsphaltFluid;
import com.drmangotea.createindustry.blocks.fluids.BurnableFluid;
import com.simibubi.create.AllTags;
@@ -127,6 +128,38 @@ public class TFMGFluids {
.build()
.register();
public static final FluidEntry<ForgeFlowingFluid.Flowing> MOLTEN_STEEL =
REGISTRATE.fluid("molten_steel",PLASTIC_STILL_RL,PLASTIC_FLOW_RL)
.lang("Molten Steel")
.properties(b -> b.viscosity(1500)
.density(1000))
.fluidProperties(p -> p.levelDecreasePerBlock(1)
.tickRate(10)
.slopeFindDistance(2)
.explosionResistance(100f))
.source(ForgeFlowingFluid.Source::new)
.bucket()
.tag(AllTags.forgeItemTag("buckets/steel"))
.build()
.register();
public static final FluidEntry<ForgeFlowingFluid.Flowing> MOLTEN_SLAG =
REGISTRATE.fluid("molten_slag",PLASTIC_STILL_RL,PLASTIC_FLOW_RL)
.lang("Molten Slag")
.properties(b -> b.viscosity(1500)
.density(1000))
.fluidProperties(p -> p.levelDecreasePerBlock(1)
.tickRate(10)
.slopeFindDistance(2)
.explosionResistance(100f))
.source(ForgeFlowingFluid.Source::new)
.bucket()
.tag(AllTags.forgeItemTag("buckets/slag"))
.build()
.register();
@@ -292,6 +325,24 @@ public class TFMGFluids {
.build()
.register();
public static final FluidEntry<ForgeFlowingFluid.Flowing> LIQUID_ASPHALT =
REGISTRATE.fluid("liquid_asphalt",CONCRETE_RL,CONCRETE_RL,
ConcreteFluidType.create(0x333333,
() -> 1f / 24f ))
.lang("Liquid Asphalt")
.properties(b -> b.viscosity(9999)
.density(9999))
.fluidProperties(p -> p.levelDecreasePerBlock(0)
.tickRate(99999)
.slopeFindDistance(0)
.explosionResistance(4f)
)
.source(AsphaltFluid.Source::new)
.bucket()
//.tag(AllTags.forgeItemTag("buckets/napalm"))
.build()
.register();
////

21
src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java
View File

@@ -31,7 +31,8 @@ public class TFMGItems {
public static final ItemEntry<Item>
STEEL_INGOT = taggedIngredient("steel_ingot", forgeItemTag("ingots/steel"), CREATE_INGOTS.tag),
CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", forgeItemTag("ingots/cast_iron"), CREATE_INGOTS.tag),
ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", forgeItemTag("ingots/aluminum"), CREATE_INGOTS.tag)
ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", forgeItemTag("ingots/aluminum"), CREATE_INGOTS.tag),
PLASTIC_SHEET = taggedIngredient("plastic_sheet", forgeItemTag("ingots/plastic"), CREATE_INGOTS.tag)
// LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag)
;
@@ -40,7 +41,20 @@ public class TFMGItems {
public static final ItemEntry<Item>
SPARK_PLUG = REGISTRATE.item("spark_plug", Item::new).register(),
SLAG = REGISTRATE.item("slag", Item::new).register(),
BITUMEN = REGISTRATE.item("bitumen", Item::new).register(),
BLASTING_MIXTURE = REGISTRATE.item("blasting_mixture", Item::new).register(),
FIREPROOF_BRICK = REGISTRATE.item("fireproof_brick", Item::new).register(),
FIRECLAY_BALL = REGISTRATE.item("fireclay_ball", Item::new).register(),
SCREW = REGISTRATE.item("screw", Item::new).register(),
HEAVY_PLATE = REGISTRATE.item("heavy_plate", Item::new).register(),
ENGINE_CHAMBER = REGISTRATE.item("engine_chamber", Item::new).register(),
ENGINE_BASE = REGISTRATE.item("engine_base", Item::new)
.model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/engine_base")))
.register(),
TURBINE_BLADE = REGISTRATE.item("turbine_blade", Item::new).register(),
THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(),
STEEL_MECHANISM = REGISTRATE.item("steel_mechanism", Item::new).register(),
CHARCOAL_DUST = REGISTRATE.item("charcoal_dust", Item::new).register(),
NITRATE_DUST = REGISTRATE.item("nitrate_dust", Item::new).register(),
@@ -49,7 +63,8 @@ public class TFMGItems {
public static final ItemEntry<SequencedAssemblyItem>
UNFINISHED_STEEL_MECHANISM = sequencedIngredient("unfinished_steel_mechanism");
UNFINISHED_STEEL_MECHANISM = sequencedIngredient("unfinished_steel_mechanism"),
UNPROCESSED_HEAVY_PLATE = sequencedIngredient("unprocessed_heavy_plate");
public static final ItemEntry<SequencedAssemblyItem>
UNFINISHED_GASOLINE_ENGINE = REGISTRATE.item("unfinished_gasoline_engine", SequencedAssemblyItem::new)

8
src/main/resources/assets/createindustry/models/block/cast_iron_distillation_controller/block.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/cast_iron_distillation_controller_top",
"bottom": "createindustry:block/cast_iron_distillation_controller_top",
"side": "createindustry:block/cast_iron_distillation_controller_side"
}
}

8
src/main/resources/assets/createindustry/models/block/cast_iron_distillation_controller/item.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/cast_iron_distillation_controller_top",
"bottom": "createindustry:block/cast_iron_distillation_controller_top",
"side": "createindustry:block/cast_iron_distillation_controller_side"
}
}

8
src/main/resources/assets/createindustry/models/block/cast_iron_distillation_output/block.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/cast_iron_distillation_controller_top",
"bottom": "createindustry:block/cast_iron_distillation_controller_top",
"side": "createindustry:block/distiller_side"
}
}

8
src/main/resources/assets/createindustry/models/block/cast_iron_distillation_output/item.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/cast_iron_distillation_controller_top",
"bottom": "createindustry:block/cast_iron_distillation_controller_top",
"side": "createindustry:block/distiller_side"
}
}

15
src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json
View File

@@ -2,7 +2,9 @@
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"1": "create:block/axis",
"2": "createindustry:block/engines/gasoline",
"3": "create:block/axis_top",
"particle": "createindustry:block/engines/gasoline"
},
"elements": [
@@ -114,6 +116,19 @@
"up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"},
"down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#2"}
}
},
{
"name": "Axis",
"from": [6, 6, 0],
"to": [10, 10, 10],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [6, 6, 10, 10], "texture": "#3"},
"east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1"},
"west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1"},
"up": {"uv": [6, 0, 10, 10], "texture": "#1"},
"down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1"}
}
}
]
}

22
src/main/resources/assets/createindustry/models/block/industrial_pipe/block.json Normal file
View File

@@ -0,0 +1,22 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/industrial_pipe",
"particle": "createindustry:block/industrial_pipe"
},
"elements": [
{
"from": [4, 0, 4],
"to": [12, 16, 12],
"faces": {
"north": {"uv": [0, 0, 4, 8], "texture": "#0"},
"east": {"uv": [0, 0, 4, 8], "texture": "#0"},
"south": {"uv": [0, 0, 4, 8], "texture": "#0"},
"west": {"uv": [0, 0, 4, 8], "texture": "#0"},
"up": {"uv": [4.5, 2.5, 8.5, 6.5], "texture": "#0"},
"down": {"uv": [4.5, 2.5, 8.5, 6.5], "texture": "#0"}
}
}
]
}

22
src/main/resources/assets/createindustry/models/block/industrial_pipe/item.json Normal file
View File

@@ -0,0 +1,22 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/industrial_pipe",
"particle": "createindustry:block/industrial_pipe"
},
"elements": [
{
"from": [4, 0, 4],
"to": [12, 16, 12],
"faces": {
"north": {"uv": [0, 0, 4, 8], "texture": "#0"},
"east": {"uv": [0, 0, 4, 8], "texture": "#0"},
"south": {"uv": [0, 0, 4, 8], "texture": "#0"},
"west": {"uv": [0, 0, 4, 8], "texture": "#0"},
"up": {"uv": [4.5, 2.5, 8.5, 6.5], "texture": "#0"},
"down": {"uv": [4.5, 2.5, 8.5, 6.5], "texture": "#0"}
}
}
]
}

144
src/main/resources/assets/createindustry/models/block/machine_input.json Normal file
View File

@@ -0,0 +1,144 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/heavy_machinery_casing",
"1": "createindustry:block/heavy_gearbox",
"2": "create:block/axis",
"3": "create:block/axis_top",
"particle": "createindustry:block/heavy_machinery_casing"
},
"elements": [
{
"from": [0, 0, 1],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 16, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 1, 16, 16], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 15, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [1, 0, 16, 16], "rotation": 270, "texture": "#0"}
}
},
{
"name": "Axis",
"from": [6, 6, 0],
"to": [10, 10, 10],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [6, 6, 10, 10], "texture": "#3"},
"east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#2"},
"south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#2"},
"west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#2"},
"up": {"uv": [6, 0, 10, 10], "texture": "#2"},
"down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#2"}
}
},
{
"from": [0, 0, 0],
"to": [16, 2, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [1, 0, 2, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#0"}
}
},
{
"from": [0, 2, 0],
"to": [2, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 14, 14, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 12, 2], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"}
}
},
{
"from": [14, 2, 0],
"to": [16, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 14, 13, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 15, 14, 16], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 12, 2], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 14, 14, 15], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"}
}
},
{
"from": [0, 14, 0],
"to": [16, 16, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [14, 0, 15, 16], "rotation": 270, "texture": "#0"}
}
},
{
"from": [13, 2, 0],
"to": [14, 3, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [13, 13, 14, 14], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [2, 2, 0],
"to": [3, 3, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [13, 2, 14, 3], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [13, 13, 0],
"to": [14, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 13, 3, 14], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [2, 13, 0],
"to": [3, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
}
]
}

128
src/main/resources/assets/createindustry/models/block/machine_input/block.json Normal file
View File

@@ -0,0 +1,128 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/heavy_machinery_casing",
"1": "createindustry:block/heavy_gearbox",
"particle": "createindustry:block/heavy_machinery_casing"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 15, 16],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 16, 15], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 15, 16], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 1, 16, 16], "texture": "#0"},
"west": {"uv": [1, 0, 16, 16], "rotation": 90, "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
},
{
"from": [0, 15, 0],
"to": [2, 16, 16],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#0"},
"east": {"uv": [1, 0, 2, 16], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 1], "texture": "#0"},
"west": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#0"},
"up": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 2, 16], "texture": "#0"}
}
},
{
"from": [2, 15, 14],
"to": [14, 16, 16],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 14, 14, 15], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 12, 1], "texture": "#0"},
"west": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#0"},
"up": {"uv": [2, 0, 14, 2], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 12, 2], "texture": "#0"}
}
},
{
"from": [2, 15, 0],
"to": [14, 16, 2],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 15, 14, 16], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 14, 14, 15], "texture": "#0"},
"west": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#0"},
"up": {"uv": [1, 14, 13, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 12, 2], "texture": "#0"}
}
},
{
"from": [14, 15, 0],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 1], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 1], "texture": "#0"},
"west": {"uv": [14, 0, 15, 16], "rotation": 90, "texture": "#0"},
"up": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 2, 16], "texture": "#0"}
}
},
{
"from": [2, 15, 2],
"to": [3, 16, 3],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"up": {"uv": [13, 13, 14, 14], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "texture": "#0"}
}
},
{
"from": [2, 15, 13],
"to": [3, 16, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"up": {"uv": [13, 2, 14, 3], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "texture": "#0"}
}
},
{
"from": [13, 15, 2],
"to": [14, 16, 3],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"up": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "texture": "#0"}
}
},
{
"from": [13, 15, 13],
"to": [14, 16, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "texture": "#0"}
}
}
]
}

144
src/main/resources/assets/createindustry/models/block/machine_input/item.json Normal file
View File

@@ -0,0 +1,144 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/heavy_machinery_casing",
"1": "createindustry:block/heavy_gearbox",
"2": "create:block/axis",
"3": "create:block/axis_top",
"particle": "createindustry:block/heavy_machinery_casing"
},
"elements": [
{
"from": [0, 0, 1],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 16, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 1, 16, 16], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 15, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [1, 0, 16, 16], "rotation": 270, "texture": "#0"}
}
},
{
"name": "Axis",
"from": [6, 6, 0],
"to": [10, 10, 10],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [6, 6, 10, 10], "texture": "#3"},
"east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#2"},
"south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#2"},
"west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#2"},
"up": {"uv": [6, 0, 10, 10], "texture": "#2"},
"down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#2"}
}
},
{
"from": [0, 0, 0],
"to": [16, 2, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [1, 0, 2, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#0"}
}
},
{
"from": [0, 2, 0],
"to": [2, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 2], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 14, 14, 15], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 12, 2], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 12, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"}
}
},
{
"from": [14, 2, 0],
"to": [16, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 14, 13, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 15, 14, 16], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 12, 2], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 14, 14, 15], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#0"}
}
},
{
"from": [0, 14, 0],
"to": [16, 16, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"},
"west": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [14, 0, 15, 16], "rotation": 270, "texture": "#0"}
}
},
{
"from": [13, 2, 0],
"to": [14, 3, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [13, 13, 14, 14], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [2, 2, 0],
"to": [3, 3, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [13, 2, 14, 3], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [13, 13, 0],
"to": [14, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 13, 3, 14], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
},
{
"from": [2, 13, 0],
"to": [3, 14, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [2, 2, 3, 3], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"south": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"west": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"up": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"},
"down": {"uv": [2, 2, 3, 3], "rotation": 270, "texture": "#0"}
}
}
]
}

8
src/main/resources/assets/createindustry/models/block/napalm_bomb/block.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/napalm_bomb_top",
"bottom": "createindustry:block/napalm_bomb_bottom",
"side": "createindustry:block/napalm_bomb_side"
}
}

8
src/main/resources/assets/createindustry/models/block/napalm_bomb/item.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "createindustry:block/napalm_bomb_top",
"bottom": "createindustry:block/napalm_bomb_bottom",
"side": "createindustry:block/napalm_bomb_side"
}
}

34
src/main/resources/assets/createindustry/models/block/pumpjack_base.json Normal file
View File

@@ -0,0 +1,34 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/pumpjack_base",
"particle": "createindustry:block/pumpjack_base"
},
"elements": [
{
"from": [3, 0, 3],
"to": [13, 14, 13],
"faces": {
"north": {"uv": [0, 2, 5, 9], "texture": "#0"},
"east": {"uv": [0, 2, 5, 9], "texture": "#0"},
"south": {"uv": [0, 2, 5, 9], "texture": "#0"},
"west": {"uv": [0, 2, 5, 9], "texture": "#0"},
"up": {"uv": [10.5, 0, 14, 4], "texture": "#0"},
"down": {"uv": [0, 11, 5, 16], "texture": "#0"}
}
},
{
"from": [2, 14, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
"east": {"uv": [10, 0, 16, 1], "texture": "#0"},
"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
"west": {"uv": [10, 0, 16, 1], "texture": "#0"},
"up": {"uv": [10, 0, 16, 6], "texture": "#0"},
"down": {"uv": [10, 0, 16, 6], "texture": "#0"}
}
}
]
}

34
src/main/resources/assets/createindustry/models/block/pumpjack_base/block.json Normal file
View File

@@ -0,0 +1,34 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/pumpjack_base",
"particle": "createindustry:block/pumpjack_base"
},
"elements": [
{
"from": [3, 0, 3],
"to": [13, 14, 13],
"faces": {
"north": {"uv": [0, 2, 5, 9], "texture": "#0"},
"east": {"uv": [0, 2, 5, 9], "texture": "#0"},
"south": {"uv": [0, 2, 5, 9], "texture": "#0"},
"west": {"uv": [0, 2, 5, 9], "texture": "#0"},
"up": {"uv": [10.5, 0, 14, 4], "texture": "#0"},
"down": {"uv": [0, 11, 5, 16], "texture": "#0"}
}
},
{
"from": [2, 14, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
"east": {"uv": [10, 0, 16, 1], "texture": "#0"},
"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
"west": {"uv": [10, 0, 16, 1], "texture": "#0"},
"up": {"uv": [10, 0, 16, 6], "texture": "#0"},
"down": {"uv": [10, 0, 16, 6], "texture": "#0"}
}
}
]
}

34
src/main/resources/assets/createindustry/models/block/pumpjack_base/item_.json Normal file
View File

@@ -0,0 +1,34 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/pumpjack_base",
"particle": "createindustry:block/pumpjack_base"
},
"elements": [
{
"from": [3, 0, 3],
"to": [13, 14, 13],
"faces": {
"north": {"uv": [0, 2, 5, 9], "texture": "#0"},
"east": {"uv": [0, 2, 5, 9], "texture": "#0"},
"south": {"uv": [0, 2, 5, 9], "texture": "#0"},
"west": {"uv": [0, 2, 5, 9], "texture": "#0"},
"up": {"uv": [10.5, 0, 14, 4], "texture": "#0"},
"down": {"uv": [0, 11, 5, 16], "texture": "#0"}
}
},
{
"from": [2, 14, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
"east": {"uv": [10, 0, 16, 1], "texture": "#0"},
"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
"west": {"uv": [10, 0, 16, 1], "texture": "#0"},
"up": {"uv": [10, 0, 16, 6], "texture": "#0"},
"down": {"uv": [10, 0, 16, 6], "texture": "#0"}
}
}
]
}

166
src/main/resources/assets/createindustry/models/block/pumpjack_crank.json Normal file
View File

@@ -0,0 +1,166 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/pumpjack_crank",
"1": "createindustry:block/heavy_machinery_casing",
"particle": "createindustry:block/pumpjack_crank"
},
"elements": [
{
"from": [-2, 2, 6],
"to": [18, 6, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"east": {"uv": [2.5, 12.5, 4.5, 14.5], "texture": "#0"},
"south": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"west": {"uv": [2.5, 12.5, 4.5, 14.5], "texture": "#0"},
"up": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"down": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"}
}
},
{
"from": [-3, 13, 2],
"to": [0, 14, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 4, 12], "texture": "#0"},
"east": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 4, 12], "texture": "#0"},
"west": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"up": {"uv": [0.5, 9, 6.5, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 3, 12], "texture": "#0"}
}
},
{
"from": [-2, 6, 6],
"to": [0, 9, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "texture": "#0"}
}
},
{
"from": [-2, 0, 6],
"to": [0, 2, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "texture": "#0"},
"down": {"uv": [2.5, 11.5, 4.5, 12.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [16, 14, 6],
"to": [18, 16, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"up": {"uv": [2.5, 11, 4.5, 12.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 13, 2],
"to": [19, 14, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [3, 11.5, 4.5, 12], "texture": "#0"},
"east": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"south": {"uv": [3, 11.5, 4.5, 12], "texture": "#0"},
"west": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"up": {"uv": [0.5, 9, 6.5, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 3, 12], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 9, 1],
"to": [19, 13, 15],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"east": {"uv": [0, 9, 7, 11], "texture": "#0"},
"south": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"west": {"uv": [0, 9, 7, 11], "texture": "#0"},
"up": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [16, 6, 6],
"to": [18, 9, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 0, 6],
"to": [18, 2, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [2.5, 11.5, 4.5, 12.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [-2, 14, 6],
"to": [0, 16, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"up": {"uv": [2.5, 11, 4.5, 12.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "texture": "#0"}
}
},
{
"from": [-3, 9, 1],
"to": [0, 13, 15],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"east": {"uv": [0, 9, 7, 11], "texture": "#0"},
"south": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"west": {"uv": [0, 9, 7, 11], "texture": "#0"},
"up": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 4, 8, 8], "texture": "#0"},
"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
"south": {"uv": [0, 4, 8, 8], "texture": "#0"},
"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}
}
}
]
}

3
src/main/resources/assets/createindustry/models/block/pumpjack_crank/block.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "block/air"
}

35
src/main/resources/assets/createindustry/models/block/pumpjack_crank/block_.json Normal file
View File

@@ -0,0 +1,35 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"0": "createindustry:block/pumpjack_crank",
"1": "createindustry:block/heavy_machinery_casing",
"particle": "createindustry:block/pumpjack_crank"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 4, 8, 8], "texture": "#0"},
"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
"south": {"uv": [0, 4, 8, 8], "texture": "#0"},
"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}
}
},
{
"from": [7, 8.01, 1],
"to": [9, 8.01, 2],
"faces": {
"north": {"uv": [0, 0, 4, 0], "texture": "#missing"},
"east": {"uv": [0, 0, 2, 0], "texture": "#missing"},
"south": {"uv": [0, 0, 4, 0], "texture": "#0"},
"west": {"uv": [0, 0, 2, 0], "texture": "#missing"},
"up": {"uv": [9.5, 3, 10.5, 3.5], "texture": "#0"},
"down": {"uv": [0, 0, 4, 2], "texture": "#missing"}
}
}
]
}

166
src/main/resources/assets/createindustry/models/block/pumpjack_crank/item_.json Normal file
View File

@@ -0,0 +1,166 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"0": "createindustry:block/pumpjack_crank",
"1": "createindustry:block/heavy_machinery_casing",
"particle": "createindustry:block/pumpjack_crank"
},
"elements": [
{
"from": [-2, 2, 6],
"to": [18, 6, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"east": {"uv": [2.5, 12.5, 4.5, 14.5], "texture": "#0"},
"south": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"west": {"uv": [2.5, 12.5, 4.5, 14.5], "texture": "#0"},
"up": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"},
"down": {"uv": [8.5, 0, 10.5, 9], "rotation": 90, "texture": "#0"}
}
},
{
"from": [-3, 13, 2],
"to": [0, 14, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 4, 12], "texture": "#0"},
"east": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 4, 12], "texture": "#0"},
"west": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"up": {"uv": [0.5, 9, 6.5, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 3, 12], "texture": "#0"}
}
},
{
"from": [-2, 6, 6],
"to": [0, 9, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "texture": "#0"}
}
},
{
"from": [-2, 0, 6],
"to": [0, 2, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "texture": "#0"},
"down": {"uv": [2.5, 11.5, 4.5, 12.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [16, 14, 6],
"to": [18, 16, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"up": {"uv": [2.5, 11, 4.5, 12.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 13, 2],
"to": [19, 14, 14],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [3, 11.5, 4.5, 12], "texture": "#0"},
"east": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"south": {"uv": [3, 11.5, 4.5, 12], "texture": "#0"},
"west": {"uv": [0.5, 8.5, 6.5, 9], "texture": "#0"},
"up": {"uv": [0.5, 9, 6.5, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 3, 12], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 9, 1],
"to": [19, 13, 15],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"east": {"uv": [0, 9, 7, 11], "texture": "#0"},
"south": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"west": {"uv": [0, 9, 7, 11], "texture": "#0"},
"up": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [16, 6, 6],
"to": [18, 9, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 11, 4.5, 12.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"}
}
},
{
"from": [16, 0, 6],
"to": [18, 2, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"south": {"uv": [2.5, 11.5, 3.5, 12.5], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "texture": "#0"},
"up": {"uv": [0, 0, 2, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [2.5, 11.5, 4.5, 12.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [-2, 14, 6],
"to": [0, 16, 10],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"east": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"south": {"uv": [2.5, 11, 3.5, 12], "texture": "#0"},
"west": {"uv": [2.5, 14.5, 4.5, 15.5], "rotation": 180, "texture": "#0"},
"up": {"uv": [2.5, 11, 4.5, 12.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 4], "texture": "#0"}
}
},
{
"from": [-3, 9, 1],
"to": [0, 13, 15],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"east": {"uv": [0, 9, 7, 11], "texture": "#0"},
"south": {"uv": [2.5, 9.5, 4, 11.5], "texture": "#0"},
"west": {"uv": [0, 9, 7, 11], "texture": "#0"},
"up": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 9, 7, 10.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 4, 8, 8], "texture": "#0"},
"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
"south": {"uv": [0, 4, 8, 8], "texture": "#0"},
"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}
}
}
]
}

112
src/main/resources/assets/createindustry/models/block/pumpjack_hammer_holder.json Normal file
View File

@@ -0,0 +1,112 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"texture_size": [32, 32],
"textures": {
"0": "createindustry:block/aluminum_post",
"1": "createindustry:block/steel_truss",
"particle": "createindustry:block/aluminum_post"
},
"elements": [
{
"from": [0, 6, 6],
"to": [16, 10, 10],
"faces": {
"north": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 0, 10, 2], "texture": "#0"},
"south": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"west": {"uv": [8, 0, 10, 2], "texture": "#0"},
"up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}
}
},
{
"from": [1, 0, 2],
"to": [1, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
},
{
"from": [0, 0, 0],
"to": [2, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 3, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 0],
"to": [16, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [0, 0, 14],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 14],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 1, 8], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [15, 0, 2],
"to": [15, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
}
],
"groups": [
{
"name": "bone",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": []
},
0,
1,
2,
3,
4,
5,
6
]
}

112
src/main/resources/assets/createindustry/models/block/pumpjack_hammer_holder/block.json Normal file
View File

@@ -0,0 +1,112 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"texture_size": [32, 32],
"textures": {
"0": "createindustry:block/aluminum_post",
"1": "createindustry:block/steel_truss",
"particle": "createindustry:block/aluminum_post"
},
"elements": [
{
"from": [0, 6, 6],
"to": [16, 10, 10],
"faces": {
"north": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 0, 10, 2], "texture": "#0"},
"south": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"west": {"uv": [8, 0, 10, 2], "texture": "#0"},
"up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}
}
},
{
"from": [1, 0, 2],
"to": [1, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
},
{
"from": [0, 0, 0],
"to": [2, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 3, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 0],
"to": [16, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [0, 0, 14],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 14],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 1, 8], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [15, 0, 2],
"to": [15, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
}
],
"groups": [
{
"name": "bone",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": []
},
0,
1,
2,
3,
4,
5,
6
]
}

112
src/main/resources/assets/createindustry/models/block/pumpjack_hammer_holder/item_.json Normal file
View File

@@ -0,0 +1,112 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/block",
"texture_size": [32, 32],
"textures": {
"0": "createindustry:block/aluminum_post",
"1": "createindustry:block/steel_truss",
"particle": "createindustry:block/aluminum_post"
},
"elements": [
{
"from": [0, 6, 6],
"to": [16, 10, 10],
"faces": {
"north": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 0, 10, 2], "texture": "#0"},
"south": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"west": {"uv": [8, 0, 10, 2], "texture": "#0"},
"up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}
}
},
{
"from": [1, 0, 2],
"to": [1, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
},
{
"from": [0, 0, 0],
"to": [2, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 3, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 0],
"to": [16, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [0, 0, 14],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [14, 0, 14],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 1, 8], "texture": "#1"},
"east": {"uv": [0, 0, 2, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 2, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"},
"down": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [15, 0, 2],
"to": [15, 16, 14],
"faces": {
"north": {"uv": [0, 0, 0, 8], "texture": "#1"},
"east": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 8], "texture": "#1"},
"west": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 6, 0], "rotation": 270, "texture": "#1"}
}
}
],
"groups": [
{
"name": "bone",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": []
},
0,
1,
2,
3,
4,
5,
6
]
}

24
src/main/resources/assets/createindustry/models/block/steel_distillation_controller/block.json Normal file
View File

@@ -0,0 +1,24 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"0": "createindustry:block/distillation_controller",
"1": "createindustry:block/distillation_controller_front",
"2": "createindustry:block/distillation_controller_top",
"particle": "createindustry:block/distillation_controller"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
"south": {"uv": [0, 0, 16, 16], "texture": "#0"},
"west": {"uv": [0, 0, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2"}
}
}
]
}

24
src/main/resources/assets/createindustry/models/block/steel_distillation_controller/item.json Normal file
View File

@@ -0,0 +1,24 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"0": "createindustry:block/distillation_controller",
"1": "createindustry:block/distillation_controller_front",
"2": "createindustry:block/distillation_controller_top",
"particle": "createindustry:block/distillation_controller"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
"south": {"uv": [0, 0, 16, 16], "texture": "#0"},
"west": {"uv": [0, 0, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2"}
}
}
]
}

23
src/main/resources/assets/createindustry/models/block/steel_distillation_output/block.json Normal file
View File

@@ -0,0 +1,23 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"0": "createindustry:block/distillation_controller_top",
"1": "createindustry:block/distillation_tower_output",
"particle": "createindustry:block/distillation_controller_top"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

23
src/main/resources/assets/createindustry/models/block/steel_distillation_output/item.json Normal file
View File

@@ -0,0 +1,23 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"0": "createindustry:block/distillation_controller_top",
"1": "createindustry:block/distillation_tower_output",
"particle": "createindustry:block/distillation_controller_top"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

BIN
src/main/resources/assets/createindustry/textures/block/asphalt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/block/diesel_engine_back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 257 B

BIN
src/main/resources/assets/createindustry/textures/block/diesel_engine_expansion.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 256 B

BIN
src/main/resources/assets/createindustry/textures/block/diesel_engine_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 258 B

BIN
src/main/resources/assets/createindustry/textures/block/diesel_engine_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 515 B

After

Width:  |  Height:  |  Size: 308 B

BIN
src/main/resources/assets/createindustry/textures/block/fireclay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

BIN
src/main/resources/assets/createindustry/textures/item/bitumen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/blasting_mixture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/fireclay_ball.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/fireproof_brick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/liquid_asphalt_bucket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/molten_slag_bucket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/createindustry/textures/item/slag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

5
src/main/resources/createindustry.mixins.json
View File

@@ -8,7 +8,10 @@
"mixins": [
"AllOreFeatureConfigEntriesMixin",
"FluidPropagatorMixin",
"ScreenEffectRendererMixin"
"FluidPipeBlockMixin",
"PipeAttachmentModelMixin"
//,
// "ScreenEffectRendererMixin"
],
"injectors": {

2
src/main/resources/data/createindustry/recipes/casting/test_caasting.json → src/main/resources/data/createindustry/recipes/casting/steel.json
View File

@@ -2,7 +2,7 @@
"type": "createindustry:casting",
"ingredients": [
{
"fluid": "createindustry:heavy_oil",
"fluid": "createindustry:molten_steel",
"amount": 1
}
],

22
src/main/resources/data/createindustry/recipes/casting/test_casting.json
View File

@@ -1,22 +0,0 @@
{
"type": "createindustry:casting",
"ingredients": [
{
"fluid": "createindustry:gasoline",
"amount": 1
}
],
"processingTime": 200,
"results": [
{
"count": 1,
"item": "createindustry:aluminum_ingot"
}
,
{
"count": 1,
"item": "createindustry:aluminum_block"
}
]
}

22
src/main/resources/data/createindustry/recipes/coking/coal_coke.json Normal file
View File

@@ -0,0 +1,22 @@
{
"type": "createindustry:coking",
"ingredients": [
{
"count": 20,
"item": "minecraft:coal"
}
],
"processingTime": 2000,
"results": [
{
"count": 20,
"item": "createindustry:coal_coke"
}
,
{
"fluid": "createindustry:creosote",
"amount": 4
}
]
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/black_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:black_high_quality_concrete"
},
"result": "createindustry:black_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/black_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:black_high_quality_concrete"
},
"result": "createindustry:black_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/black_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:black_high_quality_concrete"
},
"result": "createindustry:black_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/blue_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:blue_high_quality_concrete"
},
"result": "createindustry:blue_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/blue_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:blue_high_quality_concrete"
},
"result": "createindustry:blue_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/blue_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:blue_high_quality_concrete"
},
"result": "createindustry:blue_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/brown_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:brown_high_quality_concrete"
},
"result": "createindustry:brown_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/brown_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:brown_high_quality_concrete"
},
"result": "createindustry:brown_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/brown_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:brown_high_quality_concrete"
},
"result": "createindustry:brown_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/cyan_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:cyan_high_quality_concrete"
},
"result": "createindustry:cyan_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/cyan_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:cyan_high_quality_concrete"
},
"result": "createindustry:cyan_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/cyan_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:cyan_high_quality_concrete"
},
"result": "createindustry:cyan_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/gray_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:gray_high_quality_concrete"
},
"result": "createindustry:gray_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/gray_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:gray_high_quality_concrete"
},
"result": "createindustry:gray_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/gray_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:gray_high_quality_concrete"
},
"result": "createindustry:gray_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/green_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:green_high_quality_concrete"
},
"result": "createindustry:green_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/green_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:green_high_quality_concrete"
},
"result": "createindustry:green_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/green_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:green_high_quality_concrete"
},
"result": "createindustry:green_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_blue_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_blue_high_quality_concrete"
},
"result": "createindustry:light_blue_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_blue_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_blue_high_quality_concrete"
},
"result": "createindustry:light_blue_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_blue_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_blue_high_quality_concrete"
},
"result": "createindustry:light_blue_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_gray_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_gray_high_quality_concrete"
},
"result": "createindustry:light_gray_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_gray_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_gray_high_quality_concrete"
},
"result": "createindustry:light_gray_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/light_gray_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:light_gray_high_quality_concrete"
},
"result": "createindustry:light_gray_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/lime_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:lime_high_quality_concrete"
},
"result": "createindustry:lime_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/lime_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:lime_high_quality_concrete"
},
"result": "createindustry:lime_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/lime_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:lime_high_quality_concrete"
},
"result": "createindustry:lime_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/magenta_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:magenta_high_quality_concrete"
},
"result": "createindustry:magenta_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/magenta_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:magenta_high_quality_concrete"
},
"result": "createindustry:magenta_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/magenta_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:magenta_high_quality_concrete"
},
"result": "createindustry:magenta_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/orange_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:orange_high_quality_concrete"
},
"result": "createindustry:orange_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/orange_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:orange_high_quality_concrete"
},
"result": "createindustry:orange_high_quality_concrete_stairs",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/orange_concrete_wall_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:orange_high_quality_concrete"
},
"result": "createindustry:orange_high_quality_concrete_wall",
"count": 1
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/pink_concrete_slab_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:pink_high_quality_concrete"
},
"result": "createindustry:pink_high_quality_concrete_slab",
"count": 2
}

9
src/main/resources/data/createindustry/recipes/colored_concrete/high_quality/pink_concrete_stairs_stonecutting_q.json
View File

@@ -1,9 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "createindustry:pink_high_quality_concrete"
},
"result": "createindustry:pink_high_quality_concrete_stairs",
"count": 1
}

Some files were not shown because too many files have changed in this diff Show More