Skip to content

Commit 0044032

Browse files
code-onigiricode-onigiri
authored
Merge branch 'GregTechCEu:1.20.1' into 1.20.1
2 parents 0ef478f + e7265e9 commit 0044032

File tree

74 files changed

+1475
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1475
-319
lines changed

‎.github/workflows/build-on-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Build
2222
uses: gradle/gradle-build-action@v2
2323
with:
24-
arguments: build
24+
arguments: assemble
2525

2626
- name: Upload Artifact
2727
uses: actions/upload-artifact@v4.0.0

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencyResolutionManagement {
4444
def vineFlowerVersion = "1.+"
4545
def macheteVersion = "1.+"
4646
def configurationVersion = "2.2.0"
47-
def ldLibVersion = "1.0.25.j"
47+
def ldLibVersion = "1.0.25.m"
4848
def mixinextrasVersion = "0.2.0"
4949
def shimmerVersion = "0.2.2"
5050

‎src/generated/resources/assets/gtceu/lang/en_ud.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,6 +4172,7 @@
41724172
"item.gtceu.nano_processor_mainframe": "ǝɯɐɹɟuıɐW ɹossǝɔoɹdouɐN",
41734173
"item.gtceu.nano_processor_mainframe.tooltip.0": "ɹǝʌǝ uɐɥʇ ɹǝןןɐɯSㄥ§",
41744174
"item.gtceu.nano_processor_mainframe.tooltip.1": "ʇınɔɹıƆ ɹǝı⟘-ΛnꞀq§",
4175+
"item.gtceu.nano_saber": "ɹǝqɐS ouɐN",
41754176
"item.gtceu.nano_saber.tooltip": "¡ǝɐɹnʞ oʍ uǝʞ ou uıظnʎᴚㄥ§",
41764177
"item.gtceu.nanomuscle_boots": "sʇooᗺ ǝʇınS ™ǝןɔsnWouɐN",
41774178
"item.gtceu.nanomuscle_chestplate": "ǝʇɐןdʇsǝɥƆ ǝʇınS ™ǝןɔsnWouɐN",

‎src/generated/resources/assets/gtceu/lang/en_us.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,6 +4172,7 @@
41724172
"item.gtceu.nano_processor_mainframe": "Nanoprocessor Mainframe",
41734173
"item.gtceu.nano_processor_mainframe.tooltip.0": "§7Smaller than ever",
41744174
"item.gtceu.nano_processor_mainframe.tooltip.1": "§bLuV-Tier Circuit",
4175+
"item.gtceu.nano_saber": "Nano Saber",
41754176
"item.gtceu.nano_saber.tooltip": "§7Ryujin no ken wo kurae!",
41764177
"item.gtceu.nanomuscle_boots": "NanoMuscle™ Suite Boots",
41774178
"item.gtceu.nanomuscle_chestplate": "NanoMuscle™ Suite Chestplate",

‎src/generated/resources/assets/gtceu/models/item/nano_saber.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"overrides": [
4+
{
5+
"model": "gtceu:item/nano_saber/active",
6+
"predicate": {
7+
"gtceu:nano_saber_active": 1.0
8+
}
9+
}
10+
],
11+
"textures": {
12+
"layer0": "gtceu:item/nano_saber/normal"
13+
}
14+
}

‎src/generated/resources/assets/gtceu/models/item/nano_saber/active.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtceu:item/nano_saber/active"
5+
}
6+
}

‎src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider;
99

1010
import net.minecraft.core.BlockPos;
11+
import net.minecraft.core.Direction;
1112
import net.minecraft.world.level.BlockAndTintGetter;
1213
import net.minecraft.world.level.Level;
1314
import net.minecraft.world.level.block.Block;
@@ -16,6 +17,7 @@
1617
import net.minecraft.world.level.block.entity.BlockEntityTicker;
1718
import net.minecraft.world.level.block.entity.BlockEntityType;
1819
import net.minecraft.world.level.block.state.BlockState;
20+
import net.minecraft.world.level.block.state.properties.DirectionProperty;
1921

2022
import org.jetbrains.annotations.Nullable;
2123

@@ -26,6 +28,8 @@
2628
*/
2729
public interface IMachineBlock extends IBlockRendererProvider, EntityBlock {
2830

31+
DirectionProperty UPWARDS_FACING_PROPERTY = DirectionProperty.create("upwards_facing", Direction.Plane.HORIZONTAL);
32+
2933
default Block self() {
3034
return (Block) this;
3135
}

‎src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
99
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
1010
import com.gregtechceu.gtceu.api.machine.MetaMachine;
11+
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
1112
import com.gregtechceu.gtceu.api.machine.feature.*;
1213
import com.gregtechceu.gtceu.common.data.GTItems;
1314
import com.gregtechceu.gtceu.utils.GTUtil;
@@ -60,6 +61,7 @@
6061
* @date 2023/2/17
6162
* @implNote GTBlock
6263
*/
64+
@SuppressWarnings("deprecation")
6365
@MethodsReturnNonnullByDefault
6466
@ParametersAreNonnullByDefault
6567
public class MetaMachineBlock extends AppearanceBlock implements IMachineBlock {
@@ -74,7 +76,12 @@ public MetaMachineBlock(Properties properties, MachineDefinition definition) {
7476
this.definition = definition;
7577
this.rotationState = RotationState.get();
7678
if (rotationState != RotationState.NONE) {
77-
registerDefaultState(defaultBlockState().setValue(rotationState.property, rotationState.defaultDirection));
79+
BlockState defaultState = this.defaultBlockState().setValue(rotationState.property,
80+
rotationState.defaultDirection);
81+
if (definition instanceof MultiblockMachineDefinition multi && multi.isAllowExtendedFacing()) {
82+
defaultState = defaultState.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, Direction.NORTH);
83+
}
84+
registerDefaultState(defaultState);
7885
}
7986
}
8087

@@ -84,6 +91,10 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
8491
RotationState rotationState = RotationState.get();
8592
if (rotationState != RotationState.NONE) {
8693
pBuilder.add(rotationState.property);
94+
if (MachineDefinition.getBuilt() instanceof MultiblockMachineDefinition multi &&
95+
multi.isAllowExtendedFacing()) {
96+
pBuilder.add(IMachineBlock.UPWARDS_FACING_PROPERTY);
97+
}
8798
}
8899
}
89100

@@ -113,11 +124,6 @@ public void animateTick(BlockState state, Level level, BlockPos pos, RandomSourc
113124
}
114125
}
115126

116-
@Override
117-
public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter level, BlockPos pos) {
118-
return false;
119-
}
120-
121127
@Override
122128
public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, @Nullable LivingEntity player,
123129
ItemStack pStack) {
@@ -150,21 +156,29 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
150156
var blockPos = context.getClickedPos();
151157
var state = defaultBlockState();
152158
if (player != null && rotationState != RotationState.NONE) {
159+
if (rotationState == RotationState.Y_AXIS) {
160+
state = state.setValue(rotationState.property, Direction.UP);
161+
} else {
162+
state = state.setValue(rotationState.property, player.getDirection().getOpposite());
163+
}
153164
Vec3 pos = player.position();
154165
if (Math.abs(pos.x - (double) ((float) blockPos.getX() + 0.5F)) < 2.0D &&
155166
Math.abs(pos.z - (double) ((float) blockPos.getZ() + 0.5F)) < 2.0D) {
156167
double d0 = pos.y + (double) player.getEyeHeight();
157168
if (d0 - (double) blockPos.getY() > 2.0D && rotationState.test(Direction.UP)) {
158-
return state.setValue(rotationState.property, Direction.UP);
169+
state = state.setValue(rotationState.property, Direction.UP);
159170
}
160171
if ((double) blockPos.getY() - d0 > 0.0D && rotationState.test(Direction.DOWN)) {
161-
return state.setValue(rotationState.property, Direction.DOWN);
172+
state = state.setValue(rotationState.property, Direction.DOWN);
162173
}
163174
}
164-
if (rotationState == RotationState.Y_AXIS) {
165-
return state.setValue(rotationState.property, Direction.UP);
166-
} else {
167-
return state.setValue(rotationState.property, player.getDirection().getOpposite());
175+
if (getDefinition() instanceof MultiblockMachineDefinition multi && multi.isAllowExtendedFacing()) {
176+
Direction frontFacing = state.getValue(rotationState.property);
177+
if (frontFacing == Direction.UP) {
178+
state = state.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, player.getDirection());
179+
} else if (frontFacing == Direction.DOWN) {
180+
state = state.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, player.getDirection().getOpposite());
181+
}
168182
}
169183
}
170184
return state;

‎src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.gregtechceu.gtceu.api.capability.recipe;
22

3-
import com.gregtechceu.gtceu.api.GTValues;
43
import com.gregtechceu.gtceu.api.machine.feature.IOverclockMachine;
54
import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine;
65
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
@@ -42,10 +41,10 @@ public List<Object> compressIngredients(Collection<Object> ingredients) {
4241
@Override
4342
public int limitParallel(GTRecipe recipe, IRecipeCapabilityHolder holder, int multiplier) {
4443
long maxVoltage = Long.MAX_VALUE;
45-
if (holder instanceof IOverclockMachine overclockMachine) {
44+
if (holder instanceof ITieredMachine tieredMachine) {
45+
maxVoltage = tieredMachine.getMaxVoltage();
46+
} else if (holder instanceof IOverclockMachine overclockMachine) {
4647
maxVoltage = overclockMachine.getOverclockVoltage();
47-
} else if (holder instanceof ITieredMachine tieredMachine) {
48-
maxVoltage = GTValues.V[tieredMachine.getTier()];
4948
}
5049

5150
long recipeEUt = RecipeHelper.getOutputEUt(recipe);
@@ -58,10 +57,10 @@ public int limitParallel(GTRecipe recipe, IRecipeCapabilityHolder holder, int mu
5857
@Override
5958
public int getMaxParallelRatio(IRecipeCapabilityHolder holder, GTRecipe recipe, int parallelAmount) {
6059
long maxVoltage = Long.MAX_VALUE;
61-
if (holder instanceof IOverclockMachine overclockMachine) {
60+
if (holder instanceof ITieredMachine tieredMachine) {
61+
maxVoltage = tieredMachine.getMaxVoltage();
62+
} else if (holder instanceof IOverclockMachine overclockMachine) {
6263
maxVoltage = overclockMachine.getOverclockVoltage();
63-
} else if (holder instanceof ITieredMachine tieredMachine) {
64-
maxVoltage = GTValues.V[tieredMachine.getTier()];
6564
}
6665

6766
long recipeEUt = RecipeHelper.getInputEUt(recipe);

‎src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,9 +1149,9 @@ public Builder radioactiveHazard(float multiplier) {
11491149
properties.setProperty(HAZARD, new HazardProperty(
11501150
HazardProperty.HazardType.RADIOACTIVE,
11511151
List.of(
1152-
HazardProperty.slownessEffect(-1, (int) (2000 / multiplier), effectAmplifier),
1153-
HazardProperty.weaknessEffect(-1, (int) (2000 / multiplier), effectAmplifier),
1154-
HazardProperty.miningFautigueEffect(-1, (int) (3000 / multiplier), effectAmplifier),
1152+
HazardProperty.slownessEffect(4000, (int) (2000 / multiplier), effectAmplifier),
1153+
HazardProperty.weaknessEffect(4000, (int) (2000 / multiplier), effectAmplifier),
1154+
HazardProperty.miningFautigueEffect(4000, (int) (3000 / multiplier), effectAmplifier),
11551155
HazardProperty.maxAirLoweringEffect(1000, (int) (4000 / multiplier),
11561156
(int) (100 / multiplier)),
11571157
HazardProperty.maxHealthLoweringEffect(4000, (int) (6000 / multiplier), 10),

0 commit comments

Comments
 (0)