Skip to content

Commit f6cfa6d

Browse files
committed
Initial bump to 1.16.3 environment
1 parent c7ffb75 commit f6cfa6d

File tree

5 files changed

+28
-36
lines changed

5 files changed

+28
-36
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ run
2323

2424
# Files from Forge MDK
2525
forge*changelog.txt
26+
27+
logs/

build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ minecraft {
8888

8989
repositories {
9090
// location of the maven that hosts JEI files
91-
maven {
92-
name "Progwml Repo"
93-
url "http://dvs1.progwml6.com/files/maven"
94-
}
95-
96-
// TheOneProbe
97-
maven {
98-
name 'tterrag maven'
99-
url "http://maven.tterrag.com/"
100-
}
91+
// maven {
92+
// name "Progwml Repo"
93+
// url "http://dvs1.progwml6.com/files/maven"
94+
// }
95+
96+
// // TheOneProbe
97+
// maven {
98+
// name 'tterrag maven'
99+
// url "http://maven.tterrag.com/"
100+
// }
101101
}
102102

103103
dependencies {
@@ -107,12 +107,12 @@ dependencies {
107107
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
108108

109109
// JEI
110-
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
111-
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
110+
// compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
111+
// runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
112112

113113
// The One Probe
114-
compileOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}:api")
115-
runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
114+
// compileOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}:api")
115+
// runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
116116
}
117117

118118
// Example for how to get properties into the manifest for reading by the runtime..

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

6-
minecraft_version=1.16.1
7-
forge_version=32.0.108
6+
minecraft_version=1.16.3
7+
forge_version=34.1.0
88
mod_version=1.0.0
99

1010
# Dependencies and Libs
11-
jei_version=7.0.1.10
12-
top_version=1.16-3.0.1-beta-4
11+
jei_version=7.3.2.34
12+
# top_version=1.16-3.0.4-beta-7

src/main/java/com/robotgryphon/compactcrafting/blocks/FieldProjectorBlock.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.robotgryphon.compactcrafting.blocks.tiles.FieldProjectorTile;
44
import com.robotgryphon.compactcrafting.core.Registration;
55
import com.robotgryphon.compactcrafting.field.ProjectorHelper;
6-
import mcjty.theoneprobe.api.IProbeHitData;
7-
import mcjty.theoneprobe.api.IProbeInfo;
8-
import mcjty.theoneprobe.api.IProbeInfoProvider;
9-
import mcjty.theoneprobe.api.ProbeMode;
6+
//import mcjty.theoneprobe.api.IProbeHitData;
7+
//import mcjty.theoneprobe.api.IProbeInfo;
8+
//import mcjty.theoneprobe.api.IProbeInfoProvider;
9+
//import mcjty.theoneprobe.api.ProbeMode;
1010
import net.minecraft.block.Block;
1111
import net.minecraft.block.BlockState;
1212
import net.minecraft.entity.LivingEntity;
@@ -32,7 +32,7 @@
3232
import javax.annotation.Nullable;
3333
import java.util.Optional;
3434

35-
public class FieldProjectorBlock extends Block implements IProbeInfoProvider {
35+
public class FieldProjectorBlock extends Block {
3636

3737
public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.Plane.HORIZONTAL);
3838

@@ -76,16 +76,6 @@ public TileEntity createTileEntity(BlockState state, IBlockReader world) {
7676
return new FieldProjectorTile();
7777
}
7878

79-
@Override
80-
public String getID() {
81-
return Registration.FIELD_PROJECTOR_BLOCK.getId().toString();
82-
}
83-
84-
@Override
85-
public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, PlayerEntity playerEntity, World world, BlockState blockState, IProbeHitData iProbeHitData) {
86-
87-
}
88-
8979
@Override
9080
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
9181
if(world.isRemote)

src/main/resources/META-INF/mods.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
modLoader="javafml" #mandatory
33

44
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
5-
loaderVersion="[32,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
5+
loaderVersion="[34,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
66

77
license="All rights reserved"
88

@@ -39,7 +39,7 @@ Based off of the Compact Machines mod pre-1.16.
3939
# Does this dependency have to exist - if not, ordering below must be specified
4040
mandatory=true #mandatory
4141
# The version range of the dependency
42-
versionRange="[32,)" #mandatory
42+
versionRange="[34,)" #mandatory
4343
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
4444
ordering="NONE"
4545
# Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -49,6 +49,6 @@ Based off of the Compact Machines mod pre-1.16.
4949
[[dependencies.compactcrafting]]
5050
modId="minecraft"
5151
mandatory=true
52-
versionRange="[1.16.1]"
52+
versionRange="[1.16.3]"
5353
ordering="NONE"
5454
side="BOTH"

0 commit comments

Comments
 (0)