mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-03 22:34:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/dev

Browse source 
# Conflicts:
#	gradle.properties
This commit is contained in:
IThundxr 2025-03-01 14:02:25 -05:00
commit 4dcdc6c373
Failed to generate hash of commit
56 changed files with 249 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build.gradle
View file

@ -352,11 +352,12 @@ publishMods {
modLoaders.add("forge")
modLoaders.add("neoforge")
curseforge {
accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
projectId = "328085"
minecraftVersions.add(minecraft_version)
}
// TODO - Uncomment post update 6
// curseforge {
// accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
// projectId = "328085"
// minecraftVersions.add(minecraft_version)
// }
modrinth {
accessToken = providers.environmentVariable("MODRINTH_TOKEN")

49
src/main/java/com/simibubi/create/AllBlockSpoutingBehaviours.java Normal file
View file

@ -0,0 +1,49 @@
package com.simibubi.create;
import java.util.List;
import java.util.function.Predicate;
import com.simibubi.create.api.behaviour.spouting.BlockSpoutingBehaviour;
import com.simibubi.create.api.behaviour.spouting.CauldronSpoutingBehavior;
import com.simibubi.create.api.behaviour.spouting.StateChangingBehavior;
import com.simibubi.create.compat.Mods;
import com.simibubi.create.compat.tconstruct.SpoutCasting;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FarmBlock;
import net.minecraft.world.level.block.LayeredCauldronBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraftforge.registries.ForgeRegistries;
public class AllBlockSpoutingBehaviours {
static void registerDefaults() {
Predicate<Fluid> isWater = fluid -> fluid.isSame(Fluids.WATER);
BlockSpoutingBehaviour toMud = StateChangingBehavior.setTo(250, isWater, Blocks.MUD);
for (Block dirt : List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.ROOTED_DIRT)) {
BlockSpoutingBehaviour.BY_BLOCK.register(dirt, toMud);
}
BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.FARMLAND, StateChangingBehavior.incrementingState(100, isWater, FarmBlock.MOISTURE));
BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.WATER_CAULDRON, StateChangingBehavior.incrementingState(250, isWater, LayeredCauldronBlock.LEVEL));
BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.CAULDRON, CauldronSpoutingBehavior.INSTANCE);
if (!Mods.TCONSTRUCT.isLoaded())
return;
for (String name : List.of("table", "basin")) {
ResourceLocation id = Mods.TCONSTRUCT.rl(name);
if (ForgeRegistries.BLOCK_ENTITY_TYPES.containsKey(id)) {
BlockEntityType<?> table = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue(id);
BlockSpoutingBehaviour.BY_BLOCK_ENTITY.register(table, SpoutCasting.INSTANCE);
} else {
Create.LOGGER.warn("Block entity {} wasn't found. Outdated compat?", id);
}
}
}
}

10
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -876,7 +876,7 @@ public class AllBlocks {
.properties(p -> p.forceSolidOff())
.transform(pickaxeOnly())
.blockstate(BlockStateGen.pipe())
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
.item()
.transform(customItemModel())
.register();
@ -915,7 +915,7 @@ public class AllBlocks {
.build();
}, BlockStateProperties.WATERLOGGED);
})
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
.loot((p, b) -> p.dropOther(b, FLUID_PIPE.get()))
.register();
@ -924,7 +924,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.STONE))
.transform(pickaxeOnly())
.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
.transform(CStress.setImpact(4.0))
.item()
.transform(customItemModel())
@ -936,7 +936,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW))
.transform(pickaxeOnly())
.blockstate(new SmartFluidPipeGenerator()::generate)
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
.item()
.transform(customItemModel())
.register();
@ -948,7 +948,7 @@ public class AllBlocks {
.blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p,
(state, vertical) -> AssetLookup.partialBaseModel(c, p, vertical ? "vertical" : "horizontal",
state.getValue(FluidValveBlock.ENABLED) ? "open" : "closed")))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
.item()
.transform(customItemModel())
.register();

3
src/main/java/com/simibubi/create/Create.java
View file

@ -7,7 +7,6 @@ import org.slf4j.Logger;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mojang.logging.LogUtils;
import com.simibubi.create.api.behaviour.spouting.BlockSpoutingBehaviour;
import com.simibubi.create.compat.Mods;
import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
import com.simibubi.create.compat.curios.Curios;
@ -169,7 +168,7 @@ public class Create {
// These registrations use Create's registered objects directly so they must run after registration has finished.
BoilerHeaters.registerDefaults();
AllPortalTracks.registerDefaults();
BlockSpoutingBehaviour.registerDefaults();
AllBlockSpoutingBehaviours.registerDefaults();
AllMovementBehaviours.registerDefaults();
AllInteractionBehaviours.registerDefaults();
AllContraptionMovementSettings.registerDefaults();

39
src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java
View file

@ -1,31 +1,18 @@
package com.simibubi.create.api.behaviour.spouting;
import java.util.List;
import java.util.function.Predicate;
import org.jetbrains.annotations.Nullable;
import com.simibubi.create.Create;
import com.simibubi.create.api.registry.SimpleRegistry;
import com.simibubi.create.compat.Mods;
import com.simibubi.create.compat.tconstruct.SpoutCasting;
import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FarmBlock;
import net.minecraft.world.level.block.LayeredCauldronBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.registries.ForgeRegistries;
/**
* Interface for custom block-filling behavior for spouts.
@ -58,32 +45,6 @@ public interface BlockSpoutingBehaviour {
return BY_BLOCK_ENTITY.get(be.getType());
}
static void registerDefaults() {
Predicate<Fluid> isWater = fluid -> fluid.isSame(Fluids.WATER);
BlockSpoutingBehaviour toMud = StateChangingBehavior.setTo(250, isWater, Blocks.MUD);
for (Block dirt : List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.ROOTED_DIRT)) {
BY_BLOCK.register(dirt, toMud);
}
BY_BLOCK.register(Blocks.FARMLAND, StateChangingBehavior.incrementingState(100, isWater, FarmBlock.MOISTURE));
BY_BLOCK.register(Blocks.WATER_CAULDRON, StateChangingBehavior.incrementingState(250, isWater, LayeredCauldronBlock.LEVEL));
BY_BLOCK.register(Blocks.CAULDRON, CauldronSpoutingBehavior.INSTANCE);
if (!Mods.TCONSTRUCT.isLoaded())
return;
for (String name : List.of("table", "basin")) {
ResourceLocation id = Mods.TCONSTRUCT.rl(name);
if (ForgeRegistries.BLOCK_ENTITY_TYPES.containsKey(id)) {
BlockEntityType<?> table = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue(id);
BY_BLOCK_ENTITY.register(table, SpoutCasting.INSTANCE);
} else {
Create.LOGGER.warn("Block entity {} wasn't found. Outdated compat?", id);
}
}
}
/**
* While idle, spouts will query the behavior provided by the block below it.
* If one is present, this method will be called every tick with simulate == true.

2
src/main/java/com/simibubi/create/content/contraptions/Contraption.java
View file

@ -992,7 +992,7 @@ public abstract class Contraption {
}
@Nullable
private static BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) {
protected BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) {
BlockState state = info.state();
BlockPos pos = info.pos();
CompoundTag nbt = info.nbt();

2
src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java
View file

@ -49,7 +49,7 @@ public class BearingContraption extends Contraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.BEARING.get();
return AllContraptionTypes.BEARING.value();
}
@Override

2
src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java
View file

@ -26,7 +26,7 @@ public class ClockworkContraption extends Contraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.CLOCKWORK.get();
return AllContraptionTypes.CLOCKWORK.value();
}
private void ignoreBlocks(Set<BlockPos> blocks, BlockPos anchor) {

2
src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java
View file

@ -38,7 +38,7 @@ public class StabilizedContraption extends Contraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.STABILIZED.get();
return AllContraptionTypes.STABILIZED.value();
}
@Override

2
src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java
View file

@ -174,7 +174,7 @@ public class ElevatorContraption extends PulleyContraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.ELEVATOR.get();
return AllContraptionTypes.ELEVATOR.value();
}
public void setClientYTarget(int clientYTarget) {

2
src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java
View file

@ -50,7 +50,7 @@ public class GantryContraption extends TranslatingContraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.GANTRY.get();
return AllContraptionTypes.GANTRY.value();
}
public Direction getFacing() {

2
src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java
View file

@ -49,7 +49,7 @@ public class MountedContraption extends Contraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.MOUNTED.get();
return AllContraptionTypes.MOUNTED.value();
}
@Override

2
src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java
View file

@ -48,7 +48,7 @@ public class PistonContraption extends TranslatingContraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.PISTON.get();
return AllContraptionTypes.PISTON.value();
}
public PistonContraption() {

2
src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java
View file

@ -15,7 +15,7 @@ public class PulleyContraption extends TranslatingContraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.PULLEY.get();
return AllContraptionTypes.PULLEY.value();
}
public PulleyContraption() {}

2
src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java
View file

@ -138,7 +138,7 @@ public class WhistleBlock extends Block implements IBE<WhistleBlockEntity>, IWre
for (int i = 1; i <= 6; i++) {
BlockState blockState = pLevel.getBlockState(currentPos);
float pVolume = (soundtype.getVolume() + 1.0F) / 2.0F;
SoundEvent growSound = SoundEvents.NOTE_BLOCK_XYLOPHONE.get();
SoundEvent growSound = SoundEvents.NOTE_BLOCK_XYLOPHONE.value();
SoundEvent hitSound = soundtype.getHitSound();
if (AllBlocks.STEAM_WHISTLE_EXTENSION.has(blockState)) {

12
src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java
View file

@ -24,12 +24,12 @@ import net.minecraftforge.common.IPlantable;
import net.minecraftforge.registries.ForgeRegistries;
public class AllPotatoProjectileBlockHitActions {
static {
register("plant_crop", PlantCrop.CODEC);
register("place_block_on_ground", PlaceBlockOnGround.CODEC);
}
public static void init() {
}
@ -61,12 +61,12 @@ public class AllPotatoProjectileBlockHitActions {
if (!level.getBlockState(placePos)
.canBeReplaced())
return false;
if (!(cropBlock.get() instanceof IPlantable))
if (!(cropBlock.value() instanceof IPlantable))
return false;
BlockState blockState = level.getBlockState(hitPos);
if (!blockState.canSustainPlant(level, hitPos, face, (IPlantable) cropBlock.get()))
if (!blockState.canSustainPlant(level, hitPos, face, (IPlantable) cropBlock.value()))
return false;
level.setBlock(placePos, cropBlock.get()
level.setBlock(placePos, cropBlock.value()
.defaultBlockState(), 3);
return true;
}
@ -111,7 +111,7 @@ public class AllPotatoProjectileBlockHitActions {
y = Math.max(y, placePos.getY());
FallingBlockEntity falling = FallingBlockEntityAccessor.create$callInit(level, placePos.getX() + 0.5, y,
placePos.getZ() + 0.5, block.get().defaultBlockState());
placePos.getZ() + 0.5, block.value().defaultBlockState());
falling.time = 1;
level.addFreshEntity(falling);
}

2
src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
View file

@ -72,7 +72,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP
return null;
}
return new Ammo(ammoStack, optionalType.get().get());
return new Ammo(ammoStack, optionalType.get().value());
}
@Override

9
src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java
View file

@ -21,6 +21,7 @@ import net.minecraft.world.item.alchemy.Potion;
import net.minecraft.world.item.alchemy.PotionBrewing;
import net.minecraft.world.item.alchemy.Potions;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraftforge.common.brewing.BrewingRecipe;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
import net.minecraftforge.common.brewing.IBrewingRecipe;
@ -52,19 +53,19 @@ public class PotionMixingRecipes {
for (Item container : allowedSupportedContainers) {
BottleType bottleType = PotionFluidHandler.bottleTypeFromItem(container);
for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) {
FluidStack fromFluid = PotionFluidHandler.getFluidFromPotion(mix.from.get(), bottleType, 1000);
FluidStack toFluid = PotionFluidHandler.getFluidFromPotion(mix.to.get(), bottleType, 1000);
FluidStack fromFluid = PotionFluidHandler.getFluidFromPotion(mix.from.value(), bottleType, 1000);
FluidStack toFluid = PotionFluidHandler.getFluidFromPotion(mix.to.value(), bottleType, 1000);
mixingRecipes.add(createRecipe("potion_mixing_vanilla_" + recipeIndex++, mix.ingredient, fromFluid, toFluid));
}
}
for (PotionBrewing.Mix<Item> mix : PotionBrewing.CONTAINER_MIXES) {
Item from = mix.from.get();
Item from = mix.from.value();
if (!allowedSupportedContainers.contains(from)) {
continue;
}
Item to = mix.to.get();
Item to = mix.to.value();
if (!allowedSupportedContainers.contains(to)) {
continue;
}

16
src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java
View file

@ -8,10 +8,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
import com.simibubi.create.foundation.damageTypes.CreateDamageSources;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.nbt.NBTHelper;
import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
@ -82,9 +82,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity {
moveHands(hours, minutes);
if (AnimationTickHolder.getTicks() % 6 == 0)
playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 2f);
playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 2f);
else if (AnimationTickHolder.getTicks() % 3 == 0)
playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 1.5f);
playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 1.5f);
}
return;
}
@ -117,9 +117,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity {
if (animationType == Animation.NONE) {
if (AnimationTickHolder.getTicks() % 32 == 0)
playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 2f);
playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 2f);
else if (AnimationTickHolder.getTicks() % 16 == 0)
playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 1.5f);
playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 1.5f);
} else {
boolean isSurprise = animationType == Animation.SURPRISE;
@ -131,9 +131,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity {
// sounds
if (value == 1)
playSound(SoundEvents.NOTE_BLOCK_CHIME.get(), 2, .5f);
playSound(SoundEvents.NOTE_BLOCK_CHIME.value(), 2, .5f);
if (value == 21)
playSound(SoundEvents.NOTE_BLOCK_CHIME.get(), 2, 0.793701f);
playSound(SoundEvents.NOTE_BLOCK_CHIME.value(), 2, 0.793701f);
if (value > 30 && isSurprise) {
Vec3 pos = VecHelper.offsetRandomly(VecHelper.getCenterOf(this.worldPosition), level.random, .5f);

17
src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java
View file

@ -46,6 +46,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraftforge.common.crafting.IShapedRecipe;
import net.minecraftforge.items.ItemHandlerHelper;
@ -128,7 +129,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
if (ingredient.test(bigItemStack.stack))
craftingIngredient = new BigItemStack(bigItemStack.stack, 1);
craftingIngredients.add(craftingIngredient);
if (width < 3 && (i + 1) % width == 0)
for (int j = 0; j < 3 - width; j++)
craftingIngredients.add(emptyIngredient);
@ -136,7 +137,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
while (craftingIngredients.size() < 9)
craftingIngredients.add(emptyIngredient);
return craftingIngredients;
}
@ -191,7 +192,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
});
newInputButton.setToolTip(CreateLang.translate("gui.factory_panel.connect_input")
.component());
relocateButton = new IconButton(x + 31, y + 67, AllIcons.I_MOVE_GAUGE);
relocateButton.withCallback(() -> {
FactoryPanelConnectionHandler.startRelocating(behaviour);
@ -199,7 +200,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
});
relocateButton.setToolTip(CreateLang.translate("gui.factory_panel.relocate")
.component());
if (!restocker) {
addRenderableWidget(newInputButton);
addRenderableWidget(relocateButton);
@ -440,7 +441,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
mouseX, mouseY);
return;
}
if (itemStack.stack.isEmpty()) {
graphics.renderComponentTooltip(font, List.of(CreateLang.translate("gui.factory_panel.empty_panel")
.color(ScrollInput.HEADER_RGB)
@ -566,7 +567,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
playButtonSound();
return true;
}
// remove redstone connections
itemX = x + 9;
itemY = y + windowHeight - 24;
@ -583,14 +584,14 @@ public class FactoryPanelScreen extends AbstractSimiScreen {
public void playButtonSound() {
Minecraft.getInstance()
.getSoundManager()
.play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.get(), 1.0f, 0.25f));
.play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.value(), 1.0f, 0.25f));
}
@Override
public boolean mouseScrolled(double mouseX, double mouseY, double pDelta) {
int x = guiLeft;
int y = guiTop;
if (addressBox.mouseScrolled(mouseX, mouseY, pDelta))
return true;

12
src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java
View file

@ -119,7 +119,7 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen<Stock
if (editingItem == null)
return;
playUiSound(SoundEvents.UI_BUTTON_CLICK.get(), 1, 1);
playUiSound(SoundEvents.UI_BUTTON_CLICK.value(), 1, 1);
removeWidget(editorConfirm);
removeWidget(editorEditBox);
@ -127,14 +127,14 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen<Stock
ItemStack stackInSlot = menu.proxyInventory.getStackInSlot(0)
.copy();
boolean empty = stackInSlot.isEmpty();
if (empty && editingIndex != -1)
schedule.remove(editingIndex);
if (!empty) {
String value = editorEditBox.getValue();
stackInSlot.setHoverName(value.isBlank() ? null : Component.literal(value));
if (editingIndex == -1)
schedule.add(stackInSlot);
else
@ -348,7 +348,7 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen<Stock
renderActionTooltip(graphics, ImmutableList.of(CreateLang.translate("gui.stock_ticker.new_category")
.component()), mx, my);
if (click == 0) {
playUiSound(SoundEvents.UI_BUTTON_CLICK.get(), 1f, 1f);
playUiSound(SoundEvents.UI_BUTTON_CLICK.value(), 1f, 1f);
startEditing(-1);
}
}
@ -368,7 +368,7 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen<Stock
return true;
}
if (action(null, pMouseX, pMouseY, pButton)) {
playUiSound(SoundEvents.UI_BUTTON_CLICK.get(), 1f, 1f);
playUiSound(SoundEvents.UI_BUTTON_CLICK.value(), 1f, 1f);
return true;
}

41
src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java
View file

@ -74,6 +74,7 @@ import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.phys.AABB;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.network.simple.SimpleChannel;
import net.minecraftforge.registries.ForgeRegistries;
@ -1011,7 +1012,7 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
boolean lmb = pButton == GLFW.GLFW_MOUSE_BUTTON_LEFT;
boolean rmb = pButton == GLFW.GLFW_MOUSE_BUTTON_RIGHT;
// Search
if (rmb && searchBox.isMouseOver(pMouseX, pMouseY)) {
searchBox.setValue("");
@ -1020,7 +1021,7 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
searchBox.setFocused(true);
return true;
}
if (addressBox.isFocused()) {
if (addressBox.isHovered())
return addressBox.mouseClicked(pMouseX, pMouseY, pButton);
@ -1051,14 +1052,14 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
isLocked = !isLocked;
AllPackets.getChannel()
.sendToServer(new StockKeeperLockPacket(blockEntity.getBlockPos(), isLocked));
playUiSound(SoundEvents.UI_BUTTON_CLICK.get(), 1, 1);
playUiSound(SoundEvents.UI_BUTTON_CLICK.value(), 1, 1);
return true;
}
// Confirm
if (lmb && isConfirmHovered((int) pMouseX, (int) pMouseY)) {
sendIt();
playUiSound(SoundEvents.UI_BUTTON_CLICK.get(), 1, 1);
playUiSound(SoundEvents.UI_BUTTON_CLICK.value(), 1, 1);
return true;
}
@ -1077,17 +1078,17 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
int indexOf = entry.targetBECategory;
if (indexOf >= blockEntity.categories.size())
continue;
if (!entry.hidden) {
hiddenCategories.add(indexOf);
playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 1.5f);
playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 1.5f);
}
else {
hiddenCategories.remove(indexOf);
playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 0.675f);
playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 0.675f);
}
refreshSearchNextTick = true;
moveToTopNextTick = false;
return true;
@ -1122,8 +1123,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
if (itemsToOrder.size() >= cols || rmb)
return true;
itemsToOrder.add(existingOrder = new BigItemStack(itemStack.copyWithCount(1), 0));
playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f);
playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f);
}
int current = existingOrder.count;
@ -1132,8 +1133,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
existingOrder.count = current - transfer;
if (existingOrder.count <= 0) {
itemsToOrder.remove(existingOrder);
playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.8f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 1.8f);
playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.8f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 1.8f);
}
return true;
}
@ -1157,7 +1158,7 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
if (addressBox.mouseScrolled(mouseX, mouseY, delta))
return true;
Couple<Integer> hoveredSlot = getHoveredSlot((int) mouseX, (int) mouseY);
boolean noHover = hoveredSlot == noneHovered;
@ -1189,8 +1190,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
if (itemsToOrder.size() >= cols || remove)
return true;
itemsToOrder.add(existingOrder = new BigItemStack(entry.stack.copyWithCount(1), 0));
playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f);
playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f);
}
int current = existingOrder.count;
@ -1199,8 +1200,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
existingOrder.count = current - transfer;
if (existingOrder.count <= 0) {
itemsToOrder.remove(existingOrder);
playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.8f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 1.8f);
playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.8f);
playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 1.8f);
} else if (existingOrder.count != current)
playUiSound(AllSoundEvents.SCROLL_VALUE.getMainEvent(), 0.25f, 1.2f);
return true;
@ -1335,7 +1336,7 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
continue;
forcedEntries.add(toOrder.stack.copy(), -1 - Math.max(0, countOf - toOrder.count));
}
PackageOrder craftingRequest = PackageOrder.empty();
if (canRequestCraftingPackage && !itemsToOrder.isEmpty() && !recipesToOrder.isEmpty())
if (recipesToOrder.get(0).recipe instanceof CraftingRecipe cr)
@ -1470,7 +1471,7 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
}
}
}
canRequestCraftingPackage = false;
if (recipesToOrder.size() != 1)
return;

5
src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java
View file

@ -13,8 +13,8 @@ import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
import net.createmod.catnip.nbt.NBTHelper;
import net.createmod.catnip.data.Pair;
import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
@ -135,8 +135,7 @@ public class ArrivalSoundQueue {
if (state.getBlock() instanceof NoteBlock nb) {
float f = (float) Math.pow(2, (state.getValue(NoteBlock.NOTE) - 12) / 12.0);
playSimple(entity, state.getValue(NoteBlock.INSTRUMENT)
.getSoundEvent()
.get(), 1, f);
.getSoundEvent().value(), 1, f);
}
if (state.getBlock() instanceof WhistleBlock && info.nbt() != null) {

15
src/main/java/com/simibubi/create/content/trains/entity/CarriageContraption.java
View file

@ -157,13 +157,10 @@ public class CarriageContraption extends Contraption {
.getStep(), toLocalPos(pos));
}
if (blockState.getBlock() instanceof AbstractBogeyBlock<?> bogey) {
boolean captureBE = bogey.captureBlockEntityForTrain();
if (blockState.getBlock() instanceof AbstractBogeyBlock<?>) {
bogeys++;
if (bogeys == 2)
secondBogeyPos = pos;
return Pair.of(new StructureBlockInfo(pos, blockState, captureBE ? getBlockEntityNBT(world, pos) : null),
captureBE ? world.getBlockEntity(pos) : null);
}
MovingInteractionBehaviour behaviour = MovingInteractionBehaviour.REGISTRY.get(blockState);
@ -187,6 +184,14 @@ public class CarriageContraption extends Contraption {
return super.capture(world, pos);
}
@Override
protected BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) {
if (info.state().getBlock() instanceof AbstractBogeyBlock<?> bogey && !bogey.captureBlockEntityForTrain())
return null; // Bogeys are typically rendered by the carriage contraption, not the BE
return super.readBlockEntity(level, info, tag);
}
@Override
public CompoundTag writeNBT(boolean spawnPacket) {
CompoundTag tag = super.writeNBT(spawnPacket);
@ -231,7 +236,7 @@ public class CarriageContraption extends Contraption {
@Override
public ContraptionType getType() {
return AllContraptionTypes.CARRIAGE.get();
return AllContraptionTypes.CARRIAGE.value();
}
public Direction getAssemblyDirection() {

3
src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
View file

@ -146,8 +146,7 @@ public class ValueBox extends ChasingAABBOutline {
ItemRenderer itemRenderer = Minecraft.getInstance()
.getItemRenderer();
BakedModel modelWithOverrides = itemRenderer.getModel(stack, null, null, 0);
boolean blockItem = modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(stack, false)
.size() <= 1;
boolean blockItem = modelWithOverrides.isGui3d();
float scale = 1.5f;
ms.translate(-font.width(count), 0, 0);

3
src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
View file

@ -28,8 +28,7 @@ public class ValueBoxRenderer {
Minecraft mc = Minecraft.getInstance();
ItemRenderer itemRenderer = mc.getItemRenderer();
BakedModel modelWithOverrides = itemRenderer.getModel(filter, null, null, 0);
boolean blockItem =
modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(filter, false).size() <= 1;
boolean blockItem = modelWithOverrides.isGui3d();
float scale = (!blockItem ? .5f : 1f) + 1 / 64f;
float zOffset = (!blockItem ? -.15f : 0) + customZOffset(filter.getItem());
ms.scale(scale, scale, scale);

8
src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java
View file

@ -78,7 +78,7 @@ public interface ValueSettingsBehaviour extends ClipboardCloneable {
origin.getWorld()
.playSound(null, origin.getPos(), SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, 0.25f, 2f);
origin.getWorld()
.playSound(null, origin.getPos(), SoundEvents.NOTE_BLOCK_IRON_XYLOPHONE.get(), SoundSource.BLOCKS, 0.03f,
.playSound(null, origin.getPos(), SoundEvents.NOTE_BLOCK_IRON_XYLOPHONE.value(), SoundSource.BLOCKS, 0.03f,
1.125f);
}
@ -87,13 +87,13 @@ public interface ValueSettingsBehaviour extends ClipboardCloneable {
default boolean bypassesInput(ItemStack mainhandItem) {
return false;
}
default boolean mayInteract(Player player) {
return true;
}
default int netId() {
return 0;
}
}

4
src/main/resources/assets/create/models/block/chain_conveyor/item.json
View file

@ -10,9 +10,9 @@
"scale":[ 0.4, 0.4, 0.4 ]
},
"fixed": {
"rotation": [ 90, 0, 0 ],
"rotation": [ 270, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
"scale":[ 0.375, 0.375, 0.375 ]
}
}
}

6
src/main/resources/assets/create/models/block/clutch/item.json
View file

@ -61,6 +61,12 @@
}
}
],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
0,
1,

2
src/main/resources/assets/create/models/block/diodes/latch_off.json
View file

@ -99,7 +99,7 @@
},
"fixed": {
"rotation": [ 270, 0, 0 ],
"translation": [ 0, 0, -3],
"translation": [ 0, 0, -5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}

2
src/main/resources/assets/create/models/block/diodes/latch_on.json
View file

@ -101,7 +101,7 @@
},
"fixed": {
"rotation": [ 270, 0, 0 ],
"translation": [ 0, 0, -3],
"translation": [ 0, 0, -5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}

2
src/main/resources/assets/create/models/block/diodes/pulse_extender.json
View file

@ -94,7 +94,7 @@
},
"fixed": {
"rotation": [270, 0, 0],
"translation": [0, 0, -3],
"translation": [0, 0, -5],
"scale": [0.5, 0.5, 0.5]
}
}

2
src/main/resources/assets/create/models/block/diodes/pulse_repeater.json
View file

@ -68,7 +68,7 @@
},
"fixed": {
"rotation": [270, 0, 0],
"translation": [0, 0, -3],
"translation": [0, 0, -5],
"scale": [0.5, 0.5, 0.5]
}
}

2
src/main/resources/assets/create/models/block/diodes/pulse_timer.json
View file

@ -68,7 +68,7 @@
},
"fixed": {
"rotation": [270, 0, 0],
"translation": [0, 0, -3],
"translation": [0, 0, -5],
"scale": [0.5, 0.5, 0.5]
}
}

2
src/main/resources/assets/create/models/block/display_link/block.json
View file

@ -136,6 +136,8 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [270, 0, 0],
"translation": [0, 0, -4],
"scale": [0.5, 0.5, 0.5]
}
}

6
src/main/resources/assets/create/models/block/elevator_pulley/item.json
View file

@ -214,6 +214,12 @@
}
}
],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
{
"name": "Frame",

6
src/main/resources/assets/create/models/block/encased_chain_drive/item.json
View file

@ -80,6 +80,12 @@
}
}
],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
0,
1,

4
src/main/resources/assets/create/models/block/factory_gauge/item.json
View file

@ -112,7 +112,9 @@
"translation": [0, 14.25, 0]
},
"fixed": {
"scale": [0.5, 0.5, 0.5]
"rotation": [-90, 0, 0],
"translation": [0, 0, -6.5],
"scale": [0.75, 0.75, 0.75]
}
},
"groups": [

1
src/main/resources/assets/create/models/block/fluid_valve/item.json
View file

@ -128,6 +128,7 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [90, 0, 0],
"scale": [0.5, 0.5, 0.5]
}
},

4
src/main/resources/assets/create/models/block/flywheel/item.json
View file

@ -11,8 +11,8 @@
},
"fixed": {
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.4, 0.4, 0.4 ]
"translation": [ 0, 0, -1],
"scale":[ 0.375, 0.375, 0.375 ]
}
}
}

6
src/main/resources/assets/create/models/block/gearshift/item.json
View file

@ -80,6 +80,12 @@
}
}
],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
0,
1,

9
src/main/resources/assets/create/models/block/haunted_bell.json
View file

@ -92,5 +92,12 @@
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6]
}
]
],
"display": {
"fixed": {
"rotation": [0, 0, 0],
"translation": [0, 0, -1],
"scale": [0.5, 0.5, 0.5]
}
}
}

2
src/main/resources/assets/create/models/block/mechanical_arm/item.json
View file

@ -264,7 +264,7 @@
},
"fixed": {
"rotation": [0, 90, 0],
"translation": [0, 2.25, -0.75],
"translation": [0, 4.25, -0.75],
"scale": [0.45, 0.45, 0.45]
}
},

6
src/main/resources/assets/create/models/block/nixie_tube/block.json
View file

@ -77,5 +77,11 @@
}
]
}
},
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}
}

9
src/main/resources/assets/create/models/block/peculiar_bell.json
View file

@ -90,5 +90,12 @@
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6]
}
]
],
"display": {
"fixed": {
"rotation": [0, 0, 0],
"translation": [0, 0, -1],
"scale": [0.5, 0.5, 0.5]
}
}
}

2
src/main/resources/assets/create/models/block/portable_fluid_interface/item.json
View file

@ -102,7 +102,7 @@
"translation": [0, 22.25, 0]
},
"fixed": {
"translation": [0, -1.25, 0],
"translation": [0, 0, 0],
"scale": [0.5, 0.5, 0.5]
}
},

2
src/main/resources/assets/create/models/block/portable_storage_interface/item.json
View file

@ -210,7 +210,7 @@
"translation": [0, 22.25, 0]
},
"fixed": {
"translation": [0, -1.25, 0],
"translation": [0, 0, 0],
"scale": [0.5, 0.5, 0.5]
}
},

2
src/main/resources/assets/create/models/block/redstone_link/transmitter.json
View file

@ -99,6 +99,8 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [270, 90, 0],
"translation": [0, 0, -4],
"scale": [0.5, 0.5, 0.5]
}
}

6
src/main/resources/assets/create/models/block/sequenced_gearshift/item.json
View file

@ -80,6 +80,12 @@
}
}
],
"display": {
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
{
"name": "encased_shaft",

1
src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json
View file

@ -112,6 +112,7 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}

2
src/main/resources/assets/create/models/block/stock_link/block_vertical.json
View file

@ -148,6 +148,8 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [270, 0, 0],
"translation": [0, 0, -4],
"scale": [0.5, 0.5, 0.5]
}
}

3
src/main/resources/assets/create/models/block/table_cloth/item.json
View file

@ -202,7 +202,8 @@
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"translation": [0, 5.75, 0],
"rotation": [270, 0, 0],
"translation": [0, 0, -6],
"scale": [0.5, 0.5, 0.5]
}
},

4
src/main/resources/assets/create/models/block/threshold_switch/block_wall.json
View file

@ -37,6 +37,10 @@
"gui": {
"rotation": [30, -135, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}
}

19
src/main/resources/assets/create/models/block/valve_handle.json
View file

@ -6,5 +6,24 @@
"textures": {
"3": "create:block/valve_handle/valve_handle_copper",
"particle": "#3"
},
"display": {
"fixed": {
"rotation": [
270,
0,
0
],
"translation": [
0,
0,
-2
],
"scale": [
0.5,
0.5,
0.5
]
}
}
}

3
src/main/resources/assets/create/models/item/wand_of_symmetry/item.json
View file

@ -122,7 +122,8 @@
},
"fixed": {
"rotation": [0, 90, 0],
"translation": [0, -5, 0]
"translation": [0, -2.5, -0.75],
"scale": [0.5, 0.5, 0.5]
}
}
}

4
src/main/resources/assets/create/models/item/wrench/item.json
View file

@ -134,8 +134,8 @@
"scale": [1.09453, 1.09453, 1.09453]
},
"fixed": {
"rotation": [0, 160.5, 0],
"translation": [0.5, 0.5, 0]
"rotation": [0, 180, 0],
"translation": [0.5, 0.5, -0.75]
}
},
"groups": [